Skip to content

Commit

Permalink
identify more asset bins
Browse files Browse the repository at this point in the history
  • Loading branch information
RevoSucks committed Sep 23, 2024
1 parent 9cdabf9 commit 6e95355
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 21 deletions.
16 changes: 8 additions & 8 deletions include/sections.h
Original file line number Diff line number Diff line change
Expand Up @@ -454,18 +454,18 @@ 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 _52ABA0_ROM_START[];
extern u8 _52ABA0_ROM_END[];
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 _533B20_ROM_START[];
extern u8 _533B20_ROM_END[];
extern u8 _56E7D0_ROM_START[];
extern u8 _56E7D0_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 _5C7A70_ROM_START[];
extern u8 _5C7A70_ROM_END[];
extern u8 _5C7AD0_ROM_START[];
extern u8 _5C7AD0_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[];
Expand Down
8 changes: 4 additions & 4 deletions linker_scripts/us/symbol_addrs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,12 @@ _4BE810_ROM_START = 0x4BE810; // defined:true
area_select_ui_ROM_START = 0x4D1330; // defined:true
menu_select_ui_ROM_START = 0x4EB0C0; // defined:true
stadium_select_ui_ROM_START = 0x5046B0; // defined:true
_52ABA0_ROM_START = 0x52ABA0; // defined:true
title_ui_ROM_START = 0x52ABA0; // defined:true
_52F6D0_ROM_START = 0x52F6D0; // defined:true
_533B20_ROM_START = 0x533B20; // defined:true
_56E7D0_ROM_START = 0x56E7D0; // defined:true
battle_portraits_ROM_START = 0x533B20; // defined:true
stadium_models_ROM_START = 0x56E7D0; // defined:true
_5C7A70_ROM_START = 0x5C7A70; // defined:true
_5C7AD0_ROM_START = 0x5C7AD0; // 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
Expand Down
2 changes: 1 addition & 1 deletion src/fragments/36/fragment36.c
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ void func_82100B1C(s32 arg0) {

void func_82100B98(void) {
ASSET_LOAD(D_1000000, _4BD6B0, 0);
ASSET_LOAD(D_2000000, _52ABA0, 0);
ASSET_LOAD(D_2000000, title_ui, 0); // bin contains a JP logo and press start, but this bin is loaded for the "Press Start" gfx

D_82100EB8 = main_pool_alloc(0x4510, 0);
D_82100EBC = main_pool_alloc(0x100000, 0);
Expand Down
2 changes: 1 addition & 1 deletion src/fragments/8/fragment8.c
Original file line number Diff line number Diff line change
Expand Up @@ -1406,7 +1406,7 @@ void func_8620369C(s32 arg0, UNUSED s32 arg1) {
ASSET_LOAD(D_4000000, _6C4CE0, 0);
FRAGMENT_LOAD(func_80004454, fragment31);

func_80004454((((u32)&D_8D000000 & 0x0FF00000) >> 0x14) - 0x10, _5C7A70_ROM_START, _5C7AD0_ROM_START);
func_80004454((((u32)&D_8D000000 & 0x0FF00000) >> 0x14) - 0x10, _5C7A70_ROM_START, _5C7A70_ROM_END);

func_862030D0();
func_878029C0();
Expand Down
2 changes: 1 addition & 1 deletion src/fragments/9/fragment9.c
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ void func_86301474(UNUSED s32 arg0, UNUSED s32 arg1) {
ASSET_LOAD(D_1000000, _4BD6B0, 0);
FRAGMENT_LOAD(func_80004454, fragment31);

func_80004454((((u32)&D_8D000000 & 0x0FF00000) >> 0x14) - 0x10, _5C7A70_ROM_START, _5C7AD0_ROM_START);
func_80004454((((u32)&D_8D000000 & 0x0FF00000) >> 0x14) - 0x10, _5C7A70_ROM_START, _5C7A70_ROM_END);

func_86301234();
func_878029C0();
Expand Down
12 changes: 6 additions & 6 deletions yamls/us/rom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2438,12 +2438,12 @@
- [0x4D1330, bin, area_select_ui]
- [0x4EB0C0, bin, menu_select_ui]
- [0x5046B0, bin, stadium_select_ui]
- [0x52ABA0, bin]
- [0x52F6D0, bin]
- [0x533B20, bin]
- [0x56E7D0, bin]
- [0x5C7A70, bin]
- [0x5C7AD0, bin]
- [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...
- [0x5C7AD0, bin, pokedex_area_model]
- [0x5F6790, bin]
- [0x5F92A0, bin]
- [0x5FFC30, bin]
Expand Down

0 comments on commit 6e95355

Please sign in to comment.