Start decompiling game/ui/Page (#257)

* Decompile Page::setAnimationDirection and Page::initChildren * Decompile Page::startReplace * Implement suggestions * Decompile Page::insert and Page::setInputManager * Decompile Page::skipInAnimation * Decompile Page::skipOutAnimation * Decompile Page::draw
riidefi · Feb 2, 2023 · dd89a1c · dd89a1c
1 parent 4ed7698
commit dd89a1c
Show file tree

Hide file tree

Showing 7 changed files with 518 additions and 12 deletions.
diff --git a/pack/rel_objects.txt b/pack/rel_objects.txt
@@ -37,7 +37,7 @@ out/rel/rodata_80890d0c_80891370.o
 out/rel/data_808b3c2c_808b42e0.o
 out/Random.o
 out/rel/text_8055572c_80590128.o
-out/rel/rodata_80891380_80891c5c.o
+out/rel/rodata_80891380_80891c58.o
 out/rel/data_808b42ec_808dd3d4.o
 out/rel/bss_809bd73c_809c1900.o
 out/KartObjectProxy.o
@@ -46,7 +46,9 @@ out/ControlGroup.o
 out/rel/text_805c2c18_805f8b34.o
 out/rel/rodata_80891c80_80896148.o
 out/MessageGroup.o
-out/rel/text_805f8d5c_80786e60.o
+out/rel/text_805f8d5c_8060197c.o
+out/Page.o
+out/rel/text_80602d2c_80786e60.o
 out/BoxColManager.o
 out/rel/rodata_80896158_808a4800.o
 out/BoxColUnit.o

diff --git a/pack/rel_slices.csv b/pack/rel_slices.csv
@@ -14,5 +14,6 @@ enabled,name,textStart,textEnd,ctorsStart,ctorsEnd,dtorsStart,dtorsEnd,rodataSta
 1,source/game/kart/KartObjectProxy.cpp,0x80590128,0x805919f4,,,,,0x80891c58,0x80891c80,,,0x809c1900,0x809c1910
 1,source/game/ui/ControlGroup.cpp,0x805c23e4,0x805c2c18,,,,,,,,,,
 1,source/game/ui/MessageGroup.cpp,0x805f8b34,0x805f8d5c,,,,,0x80896148,0x80896158,,,,
+1,source/game/ui/Page.cpp,0x8060197c,0x80602d2c,,,,,,,,,,
 1,source/game/geo/BoxColManager.cpp,0x80786E60,0x80786ED0,,,,,,,,,,
 1,source/game/geo/BoxColUnit.cpp,0x80786ED0,0x80786F98,,,,,0x808A4800,0x808A4804,,,,
diff --git a/pack/symbols.yml b/pack/symbols.yml
@@ -14607,19 +14607,19 @@ global:
     0x80602144: 'unk_80602144'
     0x806022cc: 'Page_calc'
     0x80602338: 'unk_80602338'
-    0x8060235c: 'Page_draw'
+    0x8060235c: 'draw__Q22UI4PageFUl'
     0x80602378: 'unk_80602378'
     0x8060238c: 'unk_8060238c'
     0x80602390: 'Page_refocus'
     0x80602428: 'unk_80602428'
     0x80602448: 'unk_80602448'
-    0x8060244c: 'unk_8060244c'
-    0x8060245c: 'Page_initChildren'
-    0x8060246c: 'Page_insert'
-    0x80602474: 'Page_setInputManager'
-    0x8060247c: 'unk_8060247c'
-    0x80602488: 'Page_startReplace'
-    0x806024a4: 'unk_806024a4'
+    0x8060244c: 'setAnimationDirection__Q22UI4PageFl'
+    0x8060245c: 'initChildren__Q22UI4PageFl'
+    0x8060246c: 'insert__Q22UI4PageFlPQ22UI9UIControlUl'
+    0x80602474: 'setInputManager__Q22UI4PageFPQ26System12InputManager'
+    0x8060247c: 'skipInAnimation__Q22UI4PageFv'
+    0x80602488: 'startReplace__Q22UI4PageFlf'
+    0x806024a4: 'skipOutAnimation__Q22UI4PageFv'
     0x806024b0: 'Page_changeSection'
     0x80602530: 'unk_80602530'
     0x806025b0: 'Page_push'

diff --git a/source/game/ui/ControlGroup.hpp b/source/game/ui/ControlGroup.hpp
@@ -2,11 +2,10 @@
 
 #include <rk_types.h>
 
-#include <game/ui/Page.hpp>
-
 namespace UI {
 
 class UIControl;
+class Page;
 
 class ControlGroup {
 public: