Renaming files as big cleanup

splat.yaml

@@ -108,14 +108,14 @@ segments:
       - [0x19E10, asm]
       - [0x19E30, asm]
       - [0x19EB0, asm]
-      - [0x19FC0, asm, "black"]
+      - [0x19FC0, c, "black"]
-      - [0x1A050, asm]
+      - [0x1A050, c, "_ob_icy_coast"]
-      - [0x1A4F0, asm]
+      - [0x1A4F0, c, "rom_copy"]
-      - [0x1A5B0, asm]
+      - [0x1A5B0, c, "_ob_unusual_spiders"]
-      - [0x1A660, asm]
+      - [0x1A660, c, "_ob_prized_reading"]
-      - [0x1A9A0, asm]      
+      - [0x1A9A0, c, "_ob_silly_cactus"]      
-      - [0x1AA00, asm]
+      - [0x1AA00, c, "_ob_classy_fold"]
-      - [0x1AAA0, asm]
+      - [0x1AAA0, c, "_ob_dull_silver"]
       - [0x1AD10, asm]
       - [0x1AFD0, asm]
       - [0x1B030, asm]
@@ -126,9 +126,9 @@ segments:
       - [0x1B2E0, asm]
       - [0x1B320, asm]
       - [0x1B360, asm]
-      - [0x1B3A0, asm]
+      - [0x1B3A0, c, "_ob_electric_zephyr"]
-      - [0x1B3E0, asm]
+      - [0x1B3E0, c, "_ob_grumpy_island"]
-      - [0x1B510, asm]
+      - [0x1B510, c, "_ob_painful_roll"]
       - [0x1B530, asm]
       - [0x1B650, asm]
       - [0x1B7A0, asm]
@@ -374,42 +374,42 @@ segments:
     # Complete
     # find_file_boundaries: False
     subsegments:
-      - [0x40E80, asm, "segment_obdata/ob_blushing_ship"]
+      - [0x40E80, asm, "segment_obdata/_ob_blushing_ship"]
-      - [0x41C20, asm, "segment_obdata/ob_hard_hands"]
+      - [0x41C20, asm, "segment_obdata/_ob_hard_hands"]
-      - [0x420D0, asm, "segment_obdata/ob_awful_bells"]
+      - [0x420D0, asm, "segment_obdata/_ob_awful_bells"]
-      - [0x42C30, asm, "segment_obdata/ob_ugliest_snow"]
+      - [0x42C30, asm, "segment_obdata/_ob_ugliest_snow"]
-      - [0x42C90, asm, "segment_obdata/ob_lame_store"]
+      - [0x42C90, asm, "segment_obdata/_ob_lame_store"]
-      - [0x43100, asm, "segment_obdata/ob_fierce_selection"]
+      - [0x43100, asm, "segment_obdata/_ob_fierce_selection"]
       # - [0x43100, c, "class"]
       # - [0x44340, c, "ability"]
       # - [0x45480, c, "equipment"]   
-      - [0x45CB0, asm, "segment_obdata/ob_tall_hill"]
+      - [0x45CB0, asm, "segment_obdata/_ob_tall_hill"]
-      - [0x46090, asm, "segment_obdata/ob_hunky_silver"]
+      - [0x46090, asm, "segment_obdata/_ob_hunky_silver"]
-      - [0x49510, asm, "segment_obdata/ob_safe_songs"]
+      - [0x49510, asm, "segment_obdata/_ob_safe_songs"]
-      - [0x495E0, asm, "segment_obdata/ob_abandoned_shape"]
+      - [0x495E0, asm, "segment_obdata/_ob_abandoned_shape"]
-      - [0x49820, asm, "segment_obdata/ob_hardy_thrill"]
+      - [0x49820, asm, "segment_obdata/_ob_hardy_thrill"]
-      - [0x49A30, asm, "segment_obdata/ob_worthless_drawer"]
+      - [0x49A30, asm, "segment_obdata/_ob_worthless_drawer"]
-      - [0x4D5C0, asm, "segment_obdata/ob_blessed_magic"]
+      - [0x4D5C0, asm, "segment_obdata/_ob_blessed_magic"]
-      - [0x4EF10, asm, "segment_obdata/ob_pumped_books"]
+      - [0x4EF10, asm, "segment_obdata/_ob_pumped_books"]
-      - [0x514B0, asm, "segment_obdata/ob_squeamish_mask"]
+      - [0x514B0, asm, "segment_obdata/_ob_squeamish_mask"]
-      - [0x564D0, asm, "segment_obdata/ob_empty_quill"]
+      - [0x564D0, asm, "segment_obdata/_ob_empty_quill"]
-      - [0x5A030, asm, "segment_obdata/ob_utopian_queen"]
+      - [0x5A030, asm, "segment_obdata/_ob_utopian_queen"]
-      - [0x5AC70, asm, "segment_obdata/ob_mint_plantation"]
+      - [0x5AC70, asm, "segment_obdata/_ob_mint_plantation"]
-      - [0x5AFF0, asm, "segment_obdata/ob_pithy_collar"]
+      - [0x5AFF0, asm, "segment_obdata/_ob_pithy_collar"]
-      - [0x5C060, asm, "segment_obdata/ob_hallowed_class"]
+      - [0x5C060, asm, "segment_obdata/_ob_hallowed_class"]
-      - [0x5C1D0, asm, "segment_obdata/ob_driven_channel"]
+      - [0x5C1D0, asm, "segment_obdata/_ob_driven_channel"]
 
       - [0x5C210, .data, "segment_obdata/vpres"]
       - [0x5C280, .data, "gfx/dpfillrect"]
       - [0x5C510, .data, "gfx/dpfilltex"]
-      - [0x5C8A0, .data, "gfx/ob_mutual_ball"]
+      - [0x5C8A0, .data, "gfx/_ob_mutual_ball"]
-      - [0x5CAD0, .data, "gfx/ob_thick_bikes"]
+      - [0x5CAD0, .data, "gfx/_ob_thick_bikes"]
-      - [0x5CB60, .data, "gfx/ob_hospitable_friends"]
+      - [0x5CB60, .data, "gfx/_ob_hospitable_friends"]
-      - [0x5CC00, .data, "gfx/ob_broad_badge"]
+      - [0x5CC00, .data, "gfx/_ob_broad_badge"]
-      - [0x5CC90, .data, "gfx/ob_just_ducks"]
+      - [0x5CC90, .data, "gfx/_ob_just_ducks"]
-      - [0x5CCD0, .data, "gfx/ob_aspiring_shade"]
+      - [0x5CCD0, .data, "gfx/_ob_aspiring_shade"]
-      - [0x5CD20, .data, "gfx/ob_exciting_skirt"]
+      - [0x5CD20, .data, "gfx/_ob_exciting_skirt"]
-      - [0x5CD70, .data, "gfx/ob_shy_yak"]
+      - [0x5CD70, .data, "gfx/_ob_shy_yak"]
       - [0x5CE70, data, "data/strategy"]
       - [0x5CEF0, data]
       - [0x5CF00, data]
@@ -425,23 +425,23 @@ segments:
       - [0x65260, data]
       - [0x65280, data]
       - [0x652A0, data]
-      - [0x65970, .data, "gfx/ob_peaceful_screw"]
+      - [0x65970, .data, "gfx/_ob_peaceful_screw"]
       - [0x659E0, data]
       - [0x65B00, data]
-      - [0x65B80, .data, "gfx/ob_long_skirt"]
+      - [0x65B80, .data, "gfx/_ob_long_skirt"]
-      - [0x65C10, .data, "gfx/ob_pointless_account"]
+      - [0x65C10, .data, "gfx/_ob_pointless_account"]
       - [0x65C50, data]
       - [0x65CC0, data]
       
-      - [0x65D60, rodata, "segment_obdata/ob_blushing_ship"]
+      - [0x65D60, rodata, "segment_obdata/_ob_blushing_ship"]
       - [0x65DD0, rodata]
       - [0x66310, rodata]
       - [0x663C0, rodata]
-      - [0x66570, rodata, "segment_obdata/ob_hunky_silver"]
+      - [0x66570, rodata, "segment_obdata/_ob_hunky_silver"]
-      - [0x66B60, rodata, "segment_obdata/ob_worthless_drawer"]
+      - [0x66B60, rodata, "segment_obdata/_ob_worthless_drawer"]
-      - [0x66B80, rodata, "segment_obdata/ob_pumped_books"]
+      - [0x66B80, rodata, "segment_obdata/_ob_pumped_books"]
-      - [0x66D00, rodata, "segment_obdata/ob_squeamish_mask"]
+      - [0x66D00, rodata, "segment_obdata/_ob_squeamish_mask"]
-      - [0x66DA0, rodata, "segment_obdata/ob_utopian_queen"]
+      - [0x66DA0, rodata, "segment_obdata/_ob_utopian_queen"]
 
       - { start: 0x66E10, type: bss, vram: 0x80190F10 }
       

src/1AAA0.c

@@ -1,26 +0,0 @@
-#include "common.h"
-
-void func_8008A6A0(void) {
-    func_8008B130(&D_800AA040);
-}
-
-
-void func_8008A6C0(void) {
-    func_8008B1D0(&D_800AA040);
-}
-
-INCLUDE_ASM(const s32, "1AAA0", func_8008A6E0);
-
-INCLUDE_ASM(const s32, "1AAA0", func_8008A730);
-
-INCLUDE_ASM(const s32, "1AAA0", func_8008A758);
-
-INCLUDE_ASM(const s32, "1AAA0", func_8008A798);
-
-INCLUDE_ASM(const s32, "1AAA0", func_8008A850);
-
-INCLUDE_ASM(const s32, "1AAA0", func_8008A890);
-
-INCLUDE_ASM(const s32, "1AAA0", func_8008A8BC);
-
-INCLUDE_ASM(const s32, "1AAA0", func_8008A8E8);

src/_ob_dull_silver.c

@@ -0,0 +1,26 @@
+#include "common.h"
+
+void func_8008A6A0(void) {
+    func_8008B130(&D_800AA040);
+}
+
+
+void func_8008A6C0(void) {
+    func_8008B1D0(&D_800AA040);
+}
+
+INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A6E0);
+
+INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A730);
+
+INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A758);
+
+INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A798);
+
+INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A850);
+
+INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A890);
+
+INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A8BC);
+
+INCLUDE_ASM(const s32, "_ob_dull_silver", func_8008A8E8);

src/_ob_icy_coast.c

@@ -6,7 +6,7 @@ void func_80089C50(void) {
 }
 
 /* 1A060 80089C60 */
-u8 obInitControllers(void) {
+u8 obControllerInit(void) {
     u8 pattern;
     OSContStatus data[3];
 
@@ -53,7 +53,7 @@ void __start_controller_thread(void) {
     osStartThread(&THREAD_CONTROLLER);
 }
 
-INCLUDE_ASM(const s32, "1A050", __controller_thread_80089D9C);
+INCLUDE_ASM(const s32, "_ob_icy_coast", __controller_thread_80089D9C);
 
 void obInitializePi(void) {
     osCreatePiManager(OS_PRIORITY_PIMGR, &MQ_800BE030, OSMESG_800BE048, sizeof(OSMESG_800BE048) / sizeof(OSMesg));
@@ -61,7 +61,7 @@ void obInitializePi(void) {
 }
 
 /* 1A380 80089F80 */
-void romCopy_512(const void *src, void *dst, u32 len) {
+void romCopy_512(void *src, void *dst, u32 len) {
     OSIoMesg dmaIoMesgBuf;
     
     OSMesgQueue dmaMessageQ;
@@ -92,4 +92,4 @@ void romCopy_512(const void *src, void *dst, u32 len) {
 }
 
 
-INCLUDE_ASM(const s32, "1A050", func_8008A040);
+INCLUDE_ASM(const s32, "_ob_icy_coast", func_8008A040);

src/_ob_prized_reading.c

@@ -1,7 +1,7 @@
 #include "common.h"
 
 
-INCLUDE_ASM(const s32, "1A660", func_8008A260);
+INCLUDE_ASM(const s32, "_ob_prized_reading", func_8008A260);
 
 void func_8008A334(void) {
     func_8008B1D0(&D_800A9FF8);

symbol_addrs.txt

@@ -158,6 +158,8 @@ DISPLAY_LIST_801A79E8 = 0x801A79E8; // rom:0x86978
 DISPLAY_LIST_801AB8B8 = 0x801AB8B8; // rom:0xF8618
 DISPLAY_LIST_801AB918 = 0x801AB918; // rom:0xF8678
 
+DISPLAY_LIST_801B3618 = 0x801B3618; // rom:0x100658
+
 LIGHTS_801869A0 = 0x801869A0; // rom:0x5C8A0 size:40
 
 __SOMETHING_FRAMEBUFFERS = 0x800A9EE0; // rom:0x3A2E0 size:0xC
@@ -775,7 +777,7 @@ osViModePalLan1 = 0x800ABBE0;
 osViModeMpalLan1 = 0x800ABA00;
 osViModeNtscLan1 = 0x800AB960;
 
-obInitControllers = 0x80089C60;
+obControllerInit = 0x80089C60;
 
 osUnmapTLBAll = 0x8009AB00;
 osMapTLBRdb = 0x8009AAA0;