Skip to content

Commit b74a731

Browse files
committed
label asset bins up to 6E8910
1 parent cb3ce26 commit b74a731

File tree

4 files changed

+20
-15
lines changed

4 files changed

+20
-15
lines changed

include/sections.h

+8-4
Original file line numberDiff line numberDiff line change
@@ -506,10 +506,14 @@ extern u8 cup_clear_ui_ROM_START[]; // 6B0FB0
506506
extern u8 cup_clear_ui_ROM_END[]; // 6B0FB0
507507
extern u8 gb_pak_select_ui_ROM_START[]; // 6B4F00
508508
extern u8 gb_pak_select_ui_ROM_END[]; // 6B4F00
509-
extern u8 _6C4CE0_ROM_START[];
510-
extern u8 _6C4CE0_ROM_END[];
511-
extern u8 _6C4E50_ROM_START[];
512-
extern u8 _6C4E50_ROM_END[];
509+
extern u8 run_rattata_run_flag_gfx_ROM_START[];
510+
extern u8 run_rattata_run_flag_gfx_ROM_END[];
511+
extern u8 kanto_gb_map_ROM_START[];
512+
extern u8 kanto_gb_map_ROM_END[];
513+
extern u8 battle_ui_ROM_START[];
514+
extern u8 battle_ui_ROM_END[];
515+
extern u8 transfer_pak_error_ui_ROM_START[];
516+
extern u8 transfer_pak_error_ui_ROM_END[];
513517

514518
extern u8 D_124570[];
515519

linker_scripts/us/symbol_addrs.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,11 @@ snap_select_ui_ROM_START = 0x6AE1D0; // defined:true
214214
cup_clear_ui_ROM_START = 0x6B0FB0; // defined:true
215215
gb_pak_select_ui_ROM_START = 0x6B4F00; // defined:true
216216
victory_palace_plate_text_ROM_START = 0x6C1AB0; // defined:true
217-
_6C4CE0_ROM_START = 0x6C4CE0; // defined:true
218-
_6C4E50_ROM_START = 0x6C4E50; // defined:true
217+
run_rattata_run_flag_gfx_ROM_START = 0x6C4CE0; // defined:true
218+
kanto_gb_map_ROM_START = 0x6C4E50; // defined:true
219219
_6CA730_ROM_START = 0x6CA730; // defined:true
220-
_6E2FC0_ROM_START = 0x6E2FC0; // defined:true
221-
_6E8910_ROM_START = 0x6E8910; // defined:true
220+
battle_ui_ROM_START = 0x6E2FC0; // defined:true
221+
transfer_pak_error_ui_ROM_START = 0x6E8910; // defined:true
222222
_6EB340_ROM_START = 0x6EB340; // defined:true
223223
_6EC4D0_ROM_START = 0x6EC4D0; // defined:true
224224
_6ECE80_ROM_START = 0x6ECE80; // defined:true

src/fragments/8/fragment8.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1403,7 +1403,7 @@ void func_8620369C(s32 arg0, UNUSED s32 arg1) {
14031403
D_86204714 = func_8001E94C(0x16, 0);
14041404

14051405
ASSET_LOAD(D_1000000, _4BD6B0, 0);
1406-
ASSET_LOAD(D_4000000, _6C4CE0, 0);
1406+
ASSET_LOAD(D_4000000, run_rattata_run_flag_gfx, 0);
14071407
FRAGMENT_LOAD(fragment31);
14081408

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

yamls/us/rom.yaml

+7-6
Original file line numberDiff line numberDiff line change
@@ -2461,12 +2461,13 @@
24612461
- [0x6B0FB0, bin, cup_clear_ui]
24622462
- [0x6B4F00, bin, gb_pak_select_ui]
24632463
- [0x6C1AB0, bin, victory_palace_plate_text]
2464-
- [0x6C4CE0, bin]
2465-
- [0x6C4E50, bin]
2466-
- [0x6CA730, bin]
2467-
- [0x6E2FC0, bin]
2468-
- [0x6E8910, bin]
2469-
- [0x6EB340, bin]
2464+
- [0x6C4CE0, bin, run_rattata_run_flag_gfx]
2465+
- [0x6C4E50, bin, kanto_gb_map]
2466+
- [0x6CA730, bin] # unused JPEG bin of 15 JPEGs mapping onto the type constants. What is this for?
2467+
- [0x6E2F90, bin] # compressed blank file.
2468+
- [0x6E2FC0, bin, battle_ui]
2469+
- [0x6E8910, bin, transfer_pak_error_ui]
2470+
- [0x6EB340, bin] # pokedex area flags?
24702471
- [0x6EC4D0, bin]
24712472
- [0x6ECE80, bin]
24722473
- [0x701E50, bin]

0 commit comments

Comments
 (0)