Extract rodata for unk_pokedex_area_screen_helper

6 files changed, 15 insertions, 32 deletions

diff --git a/data/unk_pokedex_area_screen_helper.s b/data/battle_pyramid.s
index 2f3881446..7327fb1f8 100644
--- a/data/unk_pokedex_area_screen_helper.s
+++ b/data/battle_pyramid.s
@@ -4,22 +4,6 @@
 	.section .rodata
 
 	.align 2
-gUnknown_0861D1A0:: @ 861D1A0
-	.incbin "graphics/interface/region_map.8bpp.lz"
-
-	.align 2
-gUnknown_0861DEF4:: @ 861DEF4
-	.incbin "graphics/interface/region_map.bin.lz"
-
-	.align 2
-gUnknown_0861E208:: @ 861E208
-	.incbin "graphics/interface/region_map_affine.8bpp.lz"
-
-	.align 2
-gUnknown_0861EF64:: @ 861EF64
-	.incbin "graphics/interface/region_map_affine.bin.lz"
-
-	.align 2
 gUnknown_0861F2B4:: @ 861F2B4
 	.4byte 0x000011f0, 0x000001e1, 0x000021de
 
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h
index a73958d90..9b5358f06 100644
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -83,6 +83,6 @@ void CompactPartySlots(void);
 u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request);
 bool8 CheckFreePokemonStorageSpace(void);
 u8 StorageGetCurrentBox(void);
-u8 sub_80D214C(struct BoxPokemon* a, u8 b, u8 c, u8 d);
+u8 sub_80D214C(struct BoxPokemon *a, u8 b, u8 c, u8 d);
 
 #endif // GUARD_POKEMON_STORAGE_SYSTEM_H
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index 0580e793c..b29548258 100755
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -2,6 +2,6 @@
 #define GUARD_POKEMON_SUMMARY_SCREEN_H
 
 void sub_81C4F98(u8, void(*)(void));
-void ShowSelectMovePokemonSummaryScreen(struct Pokemon *a, u8 b, u8 c, void *d, u16 e);
+void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);
 
 #endif // GUARD_POKEMON_SUMMARY_SCREEN_H
diff --git a/ld_script.txt b/ld_script.txt
index 462af2946..2311301b0 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -540,7 +540,7 @@ SECTIONS {
         src/berry_fix_program.o(.rodata);
         src/pokemon_summary_screen.o(.rodata);
         src/unk_pokedex_area_screen_helper.o(.rodata);
-        data/unk_pokedex_area_screen_helper.o(.rodata);
+        data/battle_pyramid.o(.rodata);
         data/pokenav.o(.rodata);
         src/match_call.o(.rodata);
         data/pokenav.o(.rodata.after.match.call);
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index b5117d45d..4d194f74a 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -45,13 +45,12 @@
 
 static EWRAM_DATA struct UnkSummaryStruct
 {
-    /*0x00*/ union
-    {
+    /*0x00*/ union {
         struct Pokemon *mons;
         struct BoxPokemon *boxMons;
     } monList;
-    /*0x04*/ void (*callback)(void);
-    /*0x08*/ struct Sprite *markingsSpriteId;
+    /*0x04*/ MainCallback callback;
+    /*0x08*/ struct Sprite *markingsSprite;
     /*0x0C*/ struct Pokemon currentMon;
     /*0x70*/ struct PokeSummary
     {
@@ -3936,20 +3935,20 @@ void sub_81C4984(struct Pokemon *mon)
 {
     struct Sprite *sprite = sub_811FF94(30003, 30003, gUnknown_0861D120);
 
-    gUnknown_0203CF1C->markingsSpriteId = sprite;
+    gUnknown_0203CF1C->markingsSprite = sprite;
 
     if (sprite != NULL)
     {
         StartSpriteAnim(sprite, GetMonData(mon, MON_DATA_MARKINGS));
-        gUnknown_0203CF1C->markingsSpriteId->pos1.x = 60;
-        gUnknown_0203CF1C->markingsSpriteId->pos1.y = 26;
-        gUnknown_0203CF1C->markingsSpriteId->oam.priority = 1;
+        gUnknown_0203CF1C->markingsSprite->pos1.x = 60;
+        gUnknown_0203CF1C->markingsSprite->pos1.y = 26;
+        gUnknown_0203CF1C->markingsSprite->oam.priority = 1;
     }
 }
 
 void sub_81C49E0(struct Pokemon *mon)
 {
-    DestroySprite(gUnknown_0203CF1C->markingsSpriteId);
+    DestroySprite(gUnknown_0203CF1C->markingsSprite);
     FreeSpriteTilesByTag(30003);
     sub_81C4984(mon);
 }
diff --git a/src/unk_pokedex_area_screen_helper.c b/src/unk_pokedex_area_screen_helper.c
index 3bed79a65..521af6dd9 100644
--- a/src/unk_pokedex_area_screen_helper.c
+++ b/src/unk_pokedex_area_screen_helper.c
@@ -8,10 +8,10 @@
 EWRAM_DATA u8 *gUnknown_0203CF28 = NULL;
 
 static const u16 gUnknown_0861D140[] = INCBIN_U16("graphics/interface/region_map.gbapal");
-extern const u8 gUnknown_0861D1A0[];
-extern const u8 gUnknown_0861DEF4[];
-extern const u8 gUnknown_0861E208[];
-extern const u8 gUnknown_0861EF64[];
+static const u8 gUnknown_0861D1A0[] = INCBIN_U8("graphics/interface/region_map.8bpp.lz");
+static const u8 gUnknown_0861DEF4[] = INCBIN_U8("graphics/interface/region_map.bin.lz");
+static const u8 gUnknown_0861E208[] = INCBIN_U8("graphics/interface/region_map_affine.8bpp.lz");
+static const u8 gUnknown_0861EF64[] = INCBIN_U8("graphics/interface/region_map_affine.bin.lz");
 
 struct UnkStruct_1C4D70
 {