Merge pull request #3 from citrusbolt/pr_summaryscreen

Document the Summary Screen
pret · Mar 22, 2024 · aaedc35 · aaedc35
2 parents 0a2db93 + ec51656
commit aaedc35
Show file tree

Hide file tree

Showing 10 changed files with 940 additions and 870 deletions.
diff --git a/payload/data/all.s b/payload/data/all.s
@@ -329,15 +329,15 @@ gMonFrontPicSubspriteTable::
 	.4byte gUnknown_0201FA24
 	.4byte gUnknown_0201FA0C
 
-gUnknown_0201FA44::
+gSubspriteType::
 	sprite 1, 2, 0, 0, 0x000, 0, 0, 1
 	dummy_sprite
 
-gUnknown_0201FA5C::
+gSubspritePokeBall::
 	sprite 0, 1, 0, 0, 0x140, 0, 0, 1
 	dummy_sprite
 
-gUnknown_0201FA74::
+gSubspriteMoveSelector::
 	sprite 0, 1, 0, 0, 0x0c0, 0, 0, 1
 	sprite 0, 1, 16, 0, 0x0c4, 0, 0, 1
 	sprite 0, 1, 32, 0, 0x0c4, 0, 0, 1
@@ -350,12 +350,12 @@ gUnknown_0201FA74::
 	sprite 0, 1, 144, 0, 0x0c0, 1, 0, 1
 	dummy_sprite
 
-gUnknown_0201FAF8::
+gSubspriteStatus::
 	sprite 1, 1, 0, 0, 0x0A0, 0, 0, 1
 	dummy_sprite
 
 	.align 2, 0
-gUnknown_0201FB10::
+gWindowTemplateSummaryTitlePane::
 	.byte 0 @ bg
 	.byte 0 @ left
 	.byte 0 @ top
@@ -378,7 +378,7 @@ gUnknown_0201FB10::
 	.byte 0 @ start Y
 
 	.align 2, 0
-gUnknown_0201FB30::
+gWindowTemplateSummaryLeftPane::
 	.byte 0 @ bg
 	.byte 1 @ left
 	.byte 12 @ top
@@ -401,7 +401,7 @@ gUnknown_0201FB30::
 	.byte 0 @ start Y
 
 	.align 2, 0
-gUnknown_0201FB50::
+gWindowTemplateSummaryMainPane::
 	.byte 0 @ bg
 	.byte 11 @ left
 	.byte 3 @ top
@@ -424,7 +424,7 @@ gUnknown_0201FB50::
 	.byte 0 @ start Y
 
 	.align 2, 0
-gUnknown_0201FB70::
+gWindowTemplateSummaryInputPane::
 	.byte 0 @ bg
 	.byte 25 @ left
 	.byte 0 @ top

diff --git a/payload/include/unk_200C5DC.h b/payload/include/unk_200C5DC.h
@@ -36,7 +36,7 @@ extern volatile struct UnkStruct_020251F0 gUnknown_020251F0;
 
 void SetSpeciesCaughtFlag(u32 species, struct Pokemon *mon);
 u8 GetPlayerMapType(void);
-u8 *sub_0200CB34(u32 id);
+u8 *GetTextBufferPointer(u32 id);
 struct Struct_gUnknown_02023F50 *sub_0200C9C0(u8 *sav2, u8 *sav1, u32 arg2);
 s32 StringCompare(const u8 *str1, const u8 *str2);
 u8 *StringCopy(u8 *dst, const u8 *src);

diff --git a/payload/ld_script.txt b/payload/ld_script.txt
@@ -11,7 +11,7 @@ SECTIONS {
         asm/crt0.o(.text);
         src/main.o(.text);
         src/all.o(.text);
-        src/all2.o(.text);
+        src/pokemon_summary_screen.o(.text);
         src/all4.o(.text);
 
     } =0

diff --git a/payload/src/all.c b/payload/src/all.c
@@ -132,7 +132,7 @@ extern const struct RomHeader gRomHeader;
 extern struct Unk02021860Struct gUnknown_02021860;
 extern s32 sub_020063FC(void);
 extern s32 sub_020064BC(u32 a0, u32 a1);
-extern u32 sub_020044F0(u32 a0);
+extern u32 ShowPokemonSummaryScreen(u32 monId);
 
 void sub_02002A9C(s32 a0, u32 a1, u32 a2);
 void sub_02002C44(void);
@@ -1161,7 +1161,7 @@ s32 sub_02001A8C(u32 monId)
         case 4:
             PlaySE(SONG_SE_SELECT);
             FadeOut();
-            gUnknown_02021860.unk11B = sub_020044F0(gUnknown_02021860.unk11B);
+            gUnknown_02021860.unk11B = ShowPokemonSummaryScreen(gUnknown_02021860.unk11B);
             monId = gUnknown_02021860.unk11B;
             if (gUnknown_02021860.unk11A == 1)
             {
@@ -1310,7 +1310,7 @@ s32 sub_02001F04(s32 ret)
         case 4:
             PlaySE(SONG_SE_SELECT);
             FadeOut();
-            gUnknown_02021860.unk11B = sub_020044F0(gUnknown_02021860.unk11B);
+            gUnknown_02021860.unk11B = ShowPokemonSummaryScreen(gUnknown_02021860.unk11B);
             if (gUnknown_02021860.unk11A == 1)
             {
                 if (gUnknown_02021860.unk11B == 0)