identify more asset bins

pret · Sep 23, 2024 · a597331 · a597331
1 parent 826a110
commit a597331
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 53 deletions.
diff --git a/include/sections.h b/include/sections.h
@@ -450,53 +450,61 @@ extern u8 fragment77_ROM_END[];
 
 // Asset externs
 
-extern u8 n64_logo_texture_ROM_START[];  // 3B96B0
-extern u8 n64_logo_texture_ROM_END[];    // 3B96B0
-extern u8 fonts_ROM_START[];             // 3BA190
-extern u8 fonts_ROM_END[];               // 3BA190
-extern u8 backgrounds_ROM_START[];       // 3CB130
-extern u8 backgrounds_ROM_END[];         // 3CB130
-extern u8 battle_headers_ROM_START[];    // 45B580
-extern u8 battle_headers_ROM_END[];      // 45B580
+extern u8 n64_logo_texture_ROM_START[];    // 3B96B0
+extern u8 n64_logo_texture_ROM_END[];      // 3B96B0
+extern u8 fonts_ROM_START[];               // 3BA190
+extern u8 fonts_ROM_END[];                 // 3BA190
+extern u8 backgrounds_ROM_START[];         // 3CB130
+extern u8 backgrounds_ROM_END[];           // 3CB130
+extern u8 battle_headers_ROM_START[];      // 45B580
+extern u8 battle_headers_ROM_END[];        // 45B580
 extern u8 _4A21C0_ROM_START[];
 extern u8 _4A21C0_ROM_END[];
 extern u8 _4BD6B0_ROM_START[];
 extern u8 _4BD6B0_ROM_END[];
 extern u8 _4BE810_ROM_START[];
 extern u8 _4BE810_ROM_END[];
-extern u8 area_select_ui_ROM_START[];    // 4D1330
-extern u8 area_select_ui_ROM_END[];      // 4D1330
-extern u8 menu_select_ui_ROM_START[];    // 4EB0C0
-extern u8 menu_select_ui_ROM_END[];      // 4EB0C0
-extern u8 stadium_select_ui_ROM_START[]; // 5046B0
-extern u8 stadium_select_ui_ROM_END[];   // 5046B0
-extern u8 title_ui_ROM_START[];          // 52ABA0
-extern u8 title_ui_ROM_END[];            // 52ABA0
+extern u8 area_select_ui_ROM_START[];      // 4D1330
+extern u8 area_select_ui_ROM_END[];        // 4D1330
+extern u8 menu_select_ui_ROM_START[];      // 4EB0C0
+extern u8 menu_select_ui_ROM_END[];        // 4EB0C0
+extern u8 stadium_select_ui_ROM_START[];   // 5046B0
+extern u8 stadium_select_ui_ROM_END[];     // 5046B0
+extern u8 title_ui_ROM_START[];            // 52ABA0
+extern u8 title_ui_ROM_END[];              // 52ABA0
 extern u8 _52F6D0_ROM_START[];
 extern u8 _52F6D0_ROM_END[];
-extern u8 battle_portraits_ROM_START[];  // 533B20
-extern u8 battle_portraits_ROM_END[];    // 533B20
-extern u8 stadium_models_ROM_START[];    // 56E7D0
-extern u8 stadium_models_ROM_END[];      // 56E7D0
+extern u8 battle_portraits_ROM_START[];    // 533B20
+extern u8 battle_portraits_ROM_END[];      // 533B20
+extern u8 stadium_models_ROM_START[];      // 56E7D0
+extern u8 stadium_models_ROM_END[];        // 56E7D0
 extern u8 _5C7A70_ROM_START[];
 extern u8 _5C7A70_ROM_END[];
-extern u8 pokedex_area_model_ROM_START[]; // 5C7AD0
-extern u8 pokedex_area_model_ROM_END[];   // 5C7AD0
-extern u8 _5F6790_ROM_START[];
-extern u8 _5F6790_ROM_END[];
-extern u8 _5F92A0_ROM_START[];
-extern u8 _5F92A0_ROM_END[];
-extern u8 _5FFC30_ROM_START[];
-extern u8 _5FFC30_ROM_END[];
+extern u8 pokedex_area_model_ROM_START[];  // 5C7AD0
+extern u8 pokedex_area_model_ROM_END[];    // 5C7AD0
+extern u8 sushi_go_round_ROM_START[];      // 5F6790
+extern u8 sushi_go_round_ROM_END[];        // 5F6790
+extern u8 order_select_ui_ROM_START[];     // 5F92A0
+extern u8 order_select_ui_ROM_END[];       // 5F92A0
+extern u8 cup_ball_select_ui_ROM_START[];  // 5FFC30
+extern u8 cup_ball_select_ui_ROM_END[];    // 5FFC30
+extern u8 kids_club_select_ui_ROM_START[]; // 6230D0
+extern u8 kids_club_select_ui_ROM_END[];   // 6230D0
+extern u8 gym_leader_castle_clear_gfx_ROM_START[]; // 66E1D0
+extern u8 gym_leader_castle_clear_gfx_ROM_END[];   // 66E1D0
+extern u8 rental_rules_ui_ROM_START[];             // 66F540
+extern u8 rental_rules_ui_ROM_END[];               // 66F540
+extern u8 sushi_go_round_sprites_ROM_START[];      // 66FD80
+extern u8 sushi_go_round_sprites_ROM_END[];        // 66FD80
+extern u8 kids_club_game_ui_ROM_START[];           // 675FA0
+extern u8 kids_club_game_ui_ROM_END[];             // 675FA0
 extern u8 _6C4CE0_ROM_START[];
 extern u8 _6C4CE0_ROM_END[];
 extern u8 _6C4E50_ROM_START[];
 extern u8 _6C4E50_ROM_END[];
 
 extern u8 D_124570[];
 
-extern u8 _675FA0_ROM_START[];
-extern u8 _675FA0_ROM_END[];
 extern u8 _696350_ROM_START[];
 extern u8 textdata_ROM_START[];     // 783760
 extern u8 textdata_ROM_END[];       // 783760

diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt
@@ -198,15 +198,15 @@ battle_portraits_ROM_START = 0x533B20; // defined:true
 stadium_models_ROM_START = 0x56E7D0; // defined:true
 _5C7A70_ROM_START = 0x5C7A70; // defined:true
 pokedex_area_model_ROM_START = 0x5C7AD0; // defined:true
-_5F6790_ROM_START = 0x5F6790; // defined:true
-_5F92A0_ROM_START = 0x5F92A0; // defined:true
-_5FFC30_ROM_START = 0x5FFC30; // defined:true
-_613110_ROM_START = 0x613110; // defined:true
-_6230D0_ROM_START = 0x6230D0; // defined:true
-_66E1D0_ROM_START = 0x66E1D0; // defined:true
-_66F540_ROM_START = 0x66F540; // defined:true
-_66FD80_ROM_START = 0x66FD80; // defined:true
-_675FA0_ROM_START = 0x675FA0; // defined:true
+sushi_go_round_ROM_START = 0x5F6790; // defined:true
+order_select_ui_ROM_START = 0x5F92A0; // defined:true
+cup_ball_select_ui_ROM_START = 0x5FFC30; // defined:true
+trade_select_ui_ROM_START = 0x613110; // defined:true
+kids_club_select_ui_ROM_START = 0x6230D0; // defined:true
+gym_leader_castle_clear_gfx_ROM_START = 0x66E1D0; // defined:true
+rental_rules_ui_ROM_START = 0x66F540; // defined:true
+sushi_go_round_sprites_ROM_START = 0x66FD80; // defined:true
+kids_club_game_ui_ROM_START = 0x675FA0; // defined:true
 _696350_ROM_START = 0x696350; // defined:true
 _69D090_ROM_START = 0x69D090; // defined:true
 _6A9750_ROM_START = 0x6A9750; // defined:true

diff --git a/src/29BA0.c b/src/29BA0.c
@@ -152,7 +152,7 @@ void func_800293CC(void) {
             FRAGMENT_LOAD(fragment34);
             FRAGMENT_LOAD_AND_CALL(fragment62, 0, &D_800AE540);
         } else {
-            ASSET_LOAD(D_3000000, _675FA0, 0);
+            ASSET_LOAD(D_3000000, kids_club_game_ui, 0); // borrows the Stadium logo from it
             FRAGMENT_LOAD(fragment2);
             FRAGMENT_LOAD(fragment34);
 

diff --git a/src/2FEA0.c b/src/2FEA0.c
@@ -27,7 +27,7 @@ void func_8002F2A0(void) {
         if (sp60 != 0) {
             main_pool_push_state('mini');
 
-            ASSET_LOAD(D_3000000, _675FA0, 0);
+            ASSET_LOAD(D_3000000, kids_club_game_ui, 0);
             FRAGMENT_LOAD(fragment34);
 
             switch (sp60) {

diff --git a/src/30640.c b/src/30640.c
@@ -73,7 +73,9 @@ void func_8002FA40(void) {
             case 1:
             case 6:
                 FRAGMENT_LOAD(fragment2)();
-                ASSET_LOAD(D_3000000, _675FA0, 0);
+                // loaded, but doesnt use any GFX from it. speculated to have intended using the
+                // button GFX for How to Snap, but it doesnt use them.
+                ASSET_LOAD(D_3000000, kids_club_game_ui, 0);
                 FRAGMENT_LOAD(fragment3);
                 FRAGMENT_LOAD(fragment31);
 

diff --git a/yamls/us/rom.yaml b/yamls/us/rom.yaml
@@ -2442,18 +2442,18 @@
   - [0x52ABA0, bin, title_ui]
   - [0x52F6D0, bin] # unused. Not loaded UI graphics. Could be leftovers from Stadium 0 (JP)?
   - [0x533B20, bin, battle_portraits]
-  - [0x56E7D0, bin, stadium_models] # stadium models?
-  - [0x5C7A70, bin] # very small piece of data and doesnt appear to be loaded by anything...
+  - [0x56E7D0, bin, stadium_models]
+  - [0x5C7A70, bin]
   - [0x5C7AD0, bin, pokedex_area_model]
-  - [0x5F6790, bin]
-  - [0x5F92A0, bin]
-  - [0x5FFC30, bin]
-  - [0x613110, bin]
-  - [0x6230D0, bin]
-  - [0x66E1D0, bin]
-  - [0x66F540, bin]
-  - [0x66FD80, bin]
-  - [0x675FA0, bin]
+  - [0x5F6790, bin, sushi_go_round]
+  - [0x5F92A0, bin, order_select_ui]
+  - [0x5FFC30, bin, cup_ball_select_ui]
+  - [0x613110, bin, trade_select_ui]
+  - [0x6230D0, bin, kids_club_select_ui]
+  - [0x66E1D0, bin, gym_leader_castle_clear_gfx]
+  - [0x66F540, bin, rental_rules_ui]
+  - [0x66FD80, bin, sushi_go_round_sprites]
+  - [0x675FA0, bin, kids_club_game_ui]
   - [0x696350, bin]
   - [0x69D090, bin]
   - [0x6A9750, bin]