Skip to content

Commit a597331

Browse files
RevoSucksRevoSucks
committed
identify more asset bins
1 parent 826a110 commit a597331

File tree

6 files changed

+63
-53
lines changed

6 files changed

+63
-53
lines changed

‎include/sections.h

+38-30
Original file line numberDiff line numberDiff line change
@@ -450,53 +450,61 @@ extern u8 fragment77_ROM_END[];
450450

451451
// Asset externs
452452

453-
extern u8 n64_logo_texture_ROM_START[]; // 3B96B0
454-
extern u8 n64_logo_texture_ROM_END[]; // 3B96B0
455-
extern u8 fonts_ROM_START[]; // 3BA190
456-
extern u8 fonts_ROM_END[]; // 3BA190
457-
extern u8 backgrounds_ROM_START[]; // 3CB130
458-
extern u8 backgrounds_ROM_END[]; // 3CB130
459-
extern u8 battle_headers_ROM_START[]; // 45B580
460-
extern u8 battle_headers_ROM_END[]; // 45B580
453+
extern u8 n64_logo_texture_ROM_START[]; // 3B96B0
454+
extern u8 n64_logo_texture_ROM_END[]; // 3B96B0
455+
extern u8 fonts_ROM_START[]; // 3BA190
456+
extern u8 fonts_ROM_END[]; // 3BA190
457+
extern u8 backgrounds_ROM_START[]; // 3CB130
458+
extern u8 backgrounds_ROM_END[]; // 3CB130
459+
extern u8 battle_headers_ROM_START[]; // 45B580
460+
extern u8 battle_headers_ROM_END[]; // 45B580
461461
extern u8 _4A21C0_ROM_START[];
462462
extern u8 _4A21C0_ROM_END[];
463463
extern u8 _4BD6B0_ROM_START[];
464464
extern u8 _4BD6B0_ROM_END[];
465465
extern u8 _4BE810_ROM_START[];
466466
extern u8 _4BE810_ROM_END[];
467-
extern u8 area_select_ui_ROM_START[]; // 4D1330
468-
extern u8 area_select_ui_ROM_END[]; // 4D1330
469-
extern u8 menu_select_ui_ROM_START[]; // 4EB0C0
470-
extern u8 menu_select_ui_ROM_END[]; // 4EB0C0
471-
extern u8 stadium_select_ui_ROM_START[]; // 5046B0
472-
extern u8 stadium_select_ui_ROM_END[]; // 5046B0
473-
extern u8 title_ui_ROM_START[]; // 52ABA0
474-
extern u8 title_ui_ROM_END[]; // 52ABA0
467+
extern u8 area_select_ui_ROM_START[]; // 4D1330
468+
extern u8 area_select_ui_ROM_END[]; // 4D1330
469+
extern u8 menu_select_ui_ROM_START[]; // 4EB0C0
470+
extern u8 menu_select_ui_ROM_END[]; // 4EB0C0
471+
extern u8 stadium_select_ui_ROM_START[]; // 5046B0
472+
extern u8 stadium_select_ui_ROM_END[]; // 5046B0
473+
extern u8 title_ui_ROM_START[]; // 52ABA0
474+
extern u8 title_ui_ROM_END[]; // 52ABA0
475475
extern u8 _52F6D0_ROM_START[];
476476
extern u8 _52F6D0_ROM_END[];
477-
extern u8 battle_portraits_ROM_START[]; // 533B20
478-
extern u8 battle_portraits_ROM_END[]; // 533B20
479-
extern u8 stadium_models_ROM_START[]; // 56E7D0
480-
extern u8 stadium_models_ROM_END[]; // 56E7D0
477+
extern u8 battle_portraits_ROM_START[]; // 533B20
478+
extern u8 battle_portraits_ROM_END[]; // 533B20
479+
extern u8 stadium_models_ROM_START[]; // 56E7D0
480+
extern u8 stadium_models_ROM_END[]; // 56E7D0
481481
extern u8 _5C7A70_ROM_START[];
482482
extern u8 _5C7A70_ROM_END[];
483-
extern u8 pokedex_area_model_ROM_START[]; // 5C7AD0
484-
extern u8 pokedex_area_model_ROM_END[]; // 5C7AD0
485-
extern u8 _5F6790_ROM_START[];
486-
extern u8 _5F6790_ROM_END[];
487-
extern u8 _5F92A0_ROM_START[];
488-
extern u8 _5F92A0_ROM_END[];
489-
extern u8 _5FFC30_ROM_START[];
490-
extern u8 _5FFC30_ROM_END[];
483+
extern u8 pokedex_area_model_ROM_START[]; // 5C7AD0
484+
extern u8 pokedex_area_model_ROM_END[]; // 5C7AD0
485+
extern u8 sushi_go_round_ROM_START[]; // 5F6790
486+
extern u8 sushi_go_round_ROM_END[]; // 5F6790
487+
extern u8 order_select_ui_ROM_START[]; // 5F92A0
488+
extern u8 order_select_ui_ROM_END[]; // 5F92A0
489+
extern u8 cup_ball_select_ui_ROM_START[]; // 5FFC30
490+
extern u8 cup_ball_select_ui_ROM_END[]; // 5FFC30
491+
extern u8 kids_club_select_ui_ROM_START[]; // 6230D0
492+
extern u8 kids_club_select_ui_ROM_END[]; // 6230D0
493+
extern u8 gym_leader_castle_clear_gfx_ROM_START[]; // 66E1D0
494+
extern u8 gym_leader_castle_clear_gfx_ROM_END[]; // 66E1D0
495+
extern u8 rental_rules_ui_ROM_START[]; // 66F540
496+
extern u8 rental_rules_ui_ROM_END[]; // 66F540
497+
extern u8 sushi_go_round_sprites_ROM_START[]; // 66FD80
498+
extern u8 sushi_go_round_sprites_ROM_END[]; // 66FD80
499+
extern u8 kids_club_game_ui_ROM_START[]; // 675FA0
500+
extern u8 kids_club_game_ui_ROM_END[]; // 675FA0
491501
extern u8 _6C4CE0_ROM_START[];
492502
extern u8 _6C4CE0_ROM_END[];
493503
extern u8 _6C4E50_ROM_START[];
494504
extern u8 _6C4E50_ROM_END[];
495505

496506
extern u8 D_124570[];
497507

498-
extern u8 _675FA0_ROM_START[];
499-
extern u8 _675FA0_ROM_END[];
500508
extern u8 _696350_ROM_START[];
501509
extern u8 textdata_ROM_START[]; // 783760
502510
extern u8 textdata_ROM_END[]; // 783760

‎linker_scripts/us/symbol_addrs.txt

+9-9
Original file line numberDiff line numberDiff line change
@@ -198,15 +198,15 @@ battle_portraits_ROM_START = 0x533B20; // defined:true
198198
stadium_models_ROM_START = 0x56E7D0; // defined:true
199199
_5C7A70_ROM_START = 0x5C7A70; // defined:true
200200
pokedex_area_model_ROM_START = 0x5C7AD0; // defined:true
201-
_5F6790_ROM_START = 0x5F6790; // defined:true
202-
_5F92A0_ROM_START = 0x5F92A0; // defined:true
203-
_5FFC30_ROM_START = 0x5FFC30; // defined:true
204-
_613110_ROM_START = 0x613110; // defined:true
205-
_6230D0_ROM_START = 0x6230D0; // defined:true
206-
_66E1D0_ROM_START = 0x66E1D0; // defined:true
207-
_66F540_ROM_START = 0x66F540; // defined:true
208-
_66FD80_ROM_START = 0x66FD80; // defined:true
209-
_675FA0_ROM_START = 0x675FA0; // defined:true
201+
sushi_go_round_ROM_START = 0x5F6790; // defined:true
202+
order_select_ui_ROM_START = 0x5F92A0; // defined:true
203+
cup_ball_select_ui_ROM_START = 0x5FFC30; // defined:true
204+
trade_select_ui_ROM_START = 0x613110; // defined:true
205+
kids_club_select_ui_ROM_START = 0x6230D0; // defined:true
206+
gym_leader_castle_clear_gfx_ROM_START = 0x66E1D0; // defined:true
207+
rental_rules_ui_ROM_START = 0x66F540; // defined:true
208+
sushi_go_round_sprites_ROM_START = 0x66FD80; // defined:true
209+
kids_club_game_ui_ROM_START = 0x675FA0; // defined:true
210210
_696350_ROM_START = 0x696350; // defined:true
211211
_69D090_ROM_START = 0x69D090; // defined:true
212212
_6A9750_ROM_START = 0x6A9750; // defined:true

‎src/29BA0.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ void func_800293CC(void) {
152152
FRAGMENT_LOAD(fragment34);
153153
FRAGMENT_LOAD_AND_CALL(fragment62, 0, &D_800AE540);
154154
} else {
155-
ASSET_LOAD(D_3000000, _675FA0, 0);
155+
ASSET_LOAD(D_3000000, kids_club_game_ui, 0); // borrows the Stadium logo from it
156156
FRAGMENT_LOAD(fragment2);
157157
FRAGMENT_LOAD(fragment34);
158158

‎src/2FEA0.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ void func_8002F2A0(void) {
2727
if (sp60 != 0) {
2828
main_pool_push_state('mini');
2929

30-
ASSET_LOAD(D_3000000, _675FA0, 0);
30+
ASSET_LOAD(D_3000000, kids_club_game_ui, 0);
3131
FRAGMENT_LOAD(fragment34);
3232

3333
switch (sp60) {

‎src/30640.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ void func_8002FA40(void) {
7373
case 1:
7474
case 6:
7575
FRAGMENT_LOAD(fragment2)();
76-
ASSET_LOAD(D_3000000, _675FA0, 0);
76+
// loaded, but doesnt use any GFX from it. speculated to have intended using the
77+
// button GFX for How to Snap, but it doesnt use them.
78+
ASSET_LOAD(D_3000000, kids_club_game_ui, 0);
7779
FRAGMENT_LOAD(fragment3);
7880
FRAGMENT_LOAD(fragment31);
7981

‎yamls/us/rom.yaml

+11-11
Original file line numberDiff line numberDiff line change
@@ -2442,18 +2442,18 @@
24422442
- [0x52ABA0, bin, title_ui]
24432443
- [0x52F6D0, bin] # unused. Not loaded UI graphics. Could be leftovers from Stadium 0 (JP)?
24442444
- [0x533B20, bin, battle_portraits]
2445-
- [0x56E7D0, bin, stadium_models] # stadium models?
2446-
- [0x5C7A70, bin] # very small piece of data and doesnt appear to be loaded by anything...
2445+
- [0x56E7D0, bin, stadium_models]
2446+
- [0x5C7A70, bin]
24472447
- [0x5C7AD0, bin, pokedex_area_model]
2448-
- [0x5F6790, bin]
2449-
- [0x5F92A0, bin]
2450-
- [0x5FFC30, bin]
2451-
- [0x613110, bin]
2452-
- [0x6230D0, bin]
2453-
- [0x66E1D0, bin]
2454-
- [0x66F540, bin]
2455-
- [0x66FD80, bin]
2456-
- [0x675FA0, bin]
2448+
- [0x5F6790, bin, sushi_go_round]
2449+
- [0x5F92A0, bin, order_select_ui]
2450+
- [0x5FFC30, bin, cup_ball_select_ui]
2451+
- [0x613110, bin, trade_select_ui]
2452+
- [0x6230D0, bin, kids_club_select_ui]
2453+
- [0x66E1D0, bin, gym_leader_castle_clear_gfx]
2454+
- [0x66F540, bin, rental_rules_ui]
2455+
- [0x66FD80, bin, sushi_go_round_sprites]
2456+
- [0x675FA0, bin, kids_club_game_ui]
24572457
- [0x696350, bin]
24582458
- [0x69D090, bin]
24592459
- [0x6A9750, bin]

0 commit comments

Comments
 (0)