label asset bins up to 6E8910

pret · Sep 24, 2024 · b74a731 · b74a731
1 parent cb3ce26
commit b74a731
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/include/sections.h b/include/sections.h
@@ -506,10 +506,14 @@ extern u8 cup_clear_ui_ROM_START[];                // 6B0FB0
 extern u8 cup_clear_ui_ROM_END[];                  // 6B0FB0
 extern u8 gb_pak_select_ui_ROM_START[];            // 6B4F00
 extern u8 gb_pak_select_ui_ROM_END[];              // 6B4F00
-extern u8 _6C4CE0_ROM_START[];
-extern u8 _6C4CE0_ROM_END[];
-extern u8 _6C4E50_ROM_START[];
-extern u8 _6C4E50_ROM_END[];
+extern u8 run_rattata_run_flag_gfx_ROM_START[];
+extern u8 run_rattata_run_flag_gfx_ROM_END[];
+extern u8 kanto_gb_map_ROM_START[];
+extern u8 kanto_gb_map_ROM_END[];
+extern u8 battle_ui_ROM_START[];
+extern u8 battle_ui_ROM_END[];
+extern u8 transfer_pak_error_ui_ROM_START[];
+extern u8 transfer_pak_error_ui_ROM_END[];
 
 extern u8 D_124570[];
 

diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt
@@ -214,11 +214,11 @@ snap_select_ui_ROM_START = 0x6AE1D0; // defined:true
 cup_clear_ui_ROM_START = 0x6B0FB0; // defined:true
 gb_pak_select_ui_ROM_START = 0x6B4F00; // defined:true
 victory_palace_plate_text_ROM_START = 0x6C1AB0; // defined:true
-_6C4CE0_ROM_START = 0x6C4CE0; // defined:true
-_6C4E50_ROM_START = 0x6C4E50; // defined:true
+run_rattata_run_flag_gfx_ROM_START = 0x6C4CE0; // defined:true
+kanto_gb_map_ROM_START = 0x6C4E50; // defined:true
 _6CA730_ROM_START = 0x6CA730; // defined:true
-_6E2FC0_ROM_START = 0x6E2FC0; // defined:true
-_6E8910_ROM_START = 0x6E8910; // defined:true
+battle_ui_ROM_START = 0x6E2FC0; // defined:true
+transfer_pak_error_ui_ROM_START = 0x6E8910; // defined:true
 _6EB340_ROM_START = 0x6EB340; // defined:true
 _6EC4D0_ROM_START = 0x6EC4D0; // defined:true
 _6ECE80_ROM_START = 0x6ECE80; // defined:true

diff --git a/src/fragments/8/fragment8.c b/src/fragments/8/fragment8.c
@@ -1403,7 +1403,7 @@ void func_8620369C(s32 arg0, UNUSED s32 arg1) {
     D_86204714 = func_8001E94C(0x16, 0);
 
     ASSET_LOAD(D_1000000, _4BD6B0, 0);
-    ASSET_LOAD(D_4000000, _6C4CE0, 0);
+    ASSET_LOAD(D_4000000, run_rattata_run_flag_gfx, 0);
     FRAGMENT_LOAD(fragment31);
 
     func_80004454((((u32)&D_8D000000 & 0x0FF00000) >> 0x14) - 0x10, _5C7A70_ROM_START, _5C7A70_ROM_END);

diff --git a/yamls/us/rom.yaml b/yamls/us/rom.yaml
@@ -2461,12 +2461,13 @@
   - [0x6B0FB0, bin, cup_clear_ui]
   - [0x6B4F00, bin, gb_pak_select_ui]
   - [0x6C1AB0, bin, victory_palace_plate_text]
-  - [0x6C4CE0, bin]
-  - [0x6C4E50, bin]
-  - [0x6CA730, bin]
-  - [0x6E2FC0, bin]
-  - [0x6E8910, bin]
-  - [0x6EB340, bin]
+  - [0x6C4CE0, bin, run_rattata_run_flag_gfx]
+  - [0x6C4E50, bin, kanto_gb_map]
+  - [0x6CA730, bin] # unused JPEG bin of 15 JPEGs mapping onto the type constants. What is this for?
+  - [0x6E2F90, bin] # compressed blank file.
+  - [0x6E2FC0, bin, battle_ui]
+  - [0x6E8910, bin, transfer_pak_error_ui]
+  - [0x6EB340, bin] # pokedex area flags?
   - [0x6EC4D0, bin]
   - [0x6ECE80, bin]
   - [0x701E50, bin]