File movements and minor documentation work

IWILLCRAFT-M0d · IWILLCRAFT-M0d · commit 3f869812df8a · 2026-04-14T23:31:36.000-06:00
diff --git a/configs/JAP0/bodyprog.yaml b/configs/JAP0/bodyprog.yaml
@@ -74,7 +74,7 @@ segments:
       - [0x6EC, .rodata, events/map_msg_display]
       - [0x744, .rodata, events/bodyprog_data_800A99B4]
       - [0x804, .rodata, events/game_sys_states]
-      - [0x908, .rodata, title]
+      - [0x908, .rodata, events/title]
       - [0x9AC, rodata] # Garbage padding (should start at 0x9AB but that causes mismatches?)
       - [0x9B0, .rodata, gfx/bodyprog_8003BE50]
       - [0x1040, .rodata, gfx/map_effects]
@@ -150,8 +150,8 @@ segments:
       - [0x125A0, c, events/events_main]
       - [0x12F98, c, events/npc_main]
       - [0x13DA8, c, events/game_sys_states]
-      - [0x15CFC, c, title]
-      - [0x16F00, c, bodyprog_8003BD2C]
+      - [0x15CFC, c, events/title]
+      - [0x16F00, c, events/bodyprog_8003BD2C]
       - [0x17024, c, gfx/bodyprog_8003BE50]
       - [0x197BC, c, gfx/map_effects]
       - [0x1B1D8, c, gfx/bodyprog_80040004]
@@ -389,7 +389,7 @@ segments:
       - [0x871F0, .data, events/bodyprog_data_800A99B4]
       - [0x8725C, .data, events/events_main]
       - [0x87268, .data, events/game_sys_states]
-      - [0x872B0, .data, title]
+      - [0x872B0, .data, events/title]
       - [0x876E8, .data, gfx/bodyprog_8003BE50]
       - [0x877BC, .data, gfx/map_effects]
       - [0x87804, data]
@@ -453,7 +453,7 @@ segments:
       - [0x9A74C, pad] # Garbage
       - [0x9A750, .bss, events/game_sys_states]
       - [0x9A7AC, pad] # Garbage.
-      - [0x9A7B0, .bss, title]
+      - [0x9A7B0, .bss, events/title]
       - [0x9A7B4, bss]
       - [0x9A7B8, .bss, gfx/map_effects]
       - [0x9A7C8, bss]
diff --git a/configs/JAP0/sym.bodyprog.txt b/configs/JAP0/sym.bodyprog.txt
@@ -49,9 +49,9 @@ SFX_PAIRS                                    = 0x800252A8;
 D_80025394                                   = 0x80025380;
 D_80025448                                   = 0x80025434;
 
-//--------------------------------------------------------------
-//--- PA: 0x000908   VA: 0x80025468   subsegment: .rodata, title
-//--------------------------------------------------------------
+//---------------------------------------------------------------------
+//--- PA: 0x000908   VA: 0x80025468   subsegment: .rodata, events/title
+//---------------------------------------------------------------------
 D_80025480                                   = 0x8002546C;
 D_800254EC                                   = 0x800254D8;
 D_800254F4                                   = 0x800254E0;
@@ -484,9 +484,9 @@ SysState_EventPlaySound_Update               = 0x8003A1E8; // type:func
 SysState_GameOver_Update                     = 0x8003A260; // type:func
 GameState_MapEvent_Update                    = 0x8003A780; // type:func
 
-//--------------------------------------------------------
-//--- PA: 0x015CFC   VA: 0x8003A85C   subsegment: c, title
-//--------------------------------------------------------
+//---------------------------------------------------------------
+//--- PA: 0x015CFC   VA: 0x8003A85C   subsegment: c, events/title
+//---------------------------------------------------------------
 GameState_MainMenu_Update                    = 0x8003A85C; // type:func
 MainMenu_SelectedOptionIdxReset              = 0x8003B284; // type:func
 func_8003B560                                = 0x8003B294; // type:func
@@ -502,9 +502,9 @@ MainMenu_FogScatter                          = 0x8003B928; // type:func
 MainMenu_FogUpdate                           = 0x8003B9C0; // type:func
 func_8003BCF4                                = 0x8003BA28; // type:func
 
-//--------------------------------------------------------------------
-//--- PA: 0x016F00   VA: 0x8003BA60   subsegment: c, bodyprog_8003BD2C
-//--------------------------------------------------------------------
+//---------------------------------------------------------------------------
+//--- PA: 0x016F00   VA: 0x8003BA60   subsegment: c, events/bodyprog_8003BD2C
+//---------------------------------------------------------------------------
 Map_TypeGet                                  = 0x8003BA60; // type:func
 func_8003BD48                                = 0x8003BA7C; // type:func
 func_8003BE28                                = 0x8003BB5C; // type:func
@@ -2836,9 +2836,9 @@ g_SysStateFuncs                              = 0x800ABDC8;
 D_800A9A68                                   = 0x800ABE04;
 D_800A9A6C                                   = 0x800ABE08;
 
-//------------------------------------------------------------
-//--- PA: 0x0872B0   VA: 0x800ABE10   subsegment: .data, title
-//------------------------------------------------------------
+//-------------------------------------------------------------------
+//--- PA: 0x0872B0   VA: 0x800ABE10   subsegment: .data, events/title
+//-------------------------------------------------------------------
 g_MainMenuState                              = 0x800ABE10;
 g_MainMenu_SelectedEntry                     = 0x800ABE14;
 g_MainMenu_VisibleEntryFlags                 = 0x800ABE18;
@@ -3330,9 +3330,9 @@ g_ItemTriggerItemIds                         = 0x800BF2F0;
 D_800BCDD4                                   = 0x800BF304;
 g_MapEventData                               = 0x800BF308;
 
-//-----------------------------------------------------------
-//--- PA: 0x09A7B0   VA: 0x800BF310   subsegment: .bss, title
-//-----------------------------------------------------------
+//------------------------------------------------------------------
+//--- PA: 0x09A7B0   VA: 0x800BF310   subsegment: .bss, events/title
+//------------------------------------------------------------------
 D_800BCDE0                                   = 0x800BF310;
 
 //---------------------------------------------------------------------
diff --git a/configs/JAP1/bodyprog.yaml b/configs/JAP1/bodyprog.yaml
@@ -73,7 +73,7 @@ segments:
       - [0x6F8, .rodata, events/map_msg_display]
       - [0x750, rodata, events/bodyprog_data_800A99B4]
       - [0x810, .rodata, events/game_sys_states]
-      - [0x914, .rodata, title]
+      - [0x914, .rodata, events/title]
       - [0x9B8, rodata]
       - [0x9BC, .rodata, gfx/bodyprog_8003BE50]
       - [0x104C, .rodata, gfx/map_effects]
@@ -131,8 +131,8 @@ segments:
       - [0x12600, c, events/events_main]
       - [0x1303C, c, events/npc_main]
       - [0x13E4C, c, events/game_sys_states]
-      - [0x15DA0, c, title]
-      - [0x16FA4, c, bodyprog_8003BD2C]
+      - [0x15DA0, c, events/title]
+      - [0x16FA4, c, events/bodyprog_8003BD2C]
       - [0x170C8, c, gfx/bodyprog_8003BE50]
       - [0x19860, c, gfx/map_effects]
       - [0x1B27C, c, gfx/bodyprog_80040004]
@@ -364,7 +364,7 @@ segments:
       - [0x87314, data]
       - [0x87380, .data, events/events_main]
       - [0x8738C, .data, events/game_sys_states]
-      - [0x873D4, .data, title]
+      - [0x873D4, .data, events/title]
       - [0x87814, .data, gfx/bodyprog_8003BE50]
       - [0x878E0, .data, gfx/map_effects]
       - [0x87928, data]
@@ -401,7 +401,7 @@ segments:
       - [0x9A874, pad]
       - [0x9A878, .bss, events/game_sys_states]
       - [0x9A8D4, pad]
-      - [0x9A8D8, .bss, title]
+      - [0x9A8D8, .bss, events/title]
       - [0x9A8DC, pad]
       - [0x9A8E0, .bss, gfx/map_effects]
       - [0x9A8F0, bss]
diff --git a/configs/JAP1/sym.bodyprog.txt b/configs/JAP1/sym.bodyprog.txt
@@ -49,9 +49,9 @@ SFX_PAIRS                                    = 0x800252B4;
 D_80025394                                   = 0x8002538C;
 D_80025448                                   = 0x80025440;
 
-//--------------------------------------------------------------
-//--- PA: 0x000914   VA: 0x80025474   subsegment: .rodata, title
-//--------------------------------------------------------------
+//---------------------------------------------------------------------
+//--- PA: 0x000914   VA: 0x80025474   subsegment: .rodata, events/title
+//---------------------------------------------------------------------
 D_80025480                                   = 0x80025478;
 D_800254EC                                   = 0x800254E4;
 D_800254F4                                   = 0x800254EC;
@@ -542,9 +542,9 @@ SysState_EventPlaySound_Update               = 0x8003A28C; // type:func
 SysState_GameOver_Update                     = 0x8003A304; // type:func
 GameState_MapEvent_Update                    = 0x8003A824; // type:func
 
-//--------------------------------------------------------
-//--- PA: 0x015DA0   VA: 0x8003A900   subsegment: c, title
-//--------------------------------------------------------
+//---------------------------------------------------------------
+//--- PA: 0x015DA0   VA: 0x8003A900   subsegment: c, events/title
+//---------------------------------------------------------------
 GameState_MainMenu_Update                    = 0x8003A900; // type:func
 MainMenu_SelectedOptionIdxReset              = 0x8003B328; // type:func
 func_8003B560                                = 0x8003B338; // type:func
@@ -560,9 +560,9 @@ MainMenu_FogScatter                          = 0x8003B9CC; // type:func
 MainMenu_FogUpdate                           = 0x8003BA64; // type:func
 func_8003BCF4                                = 0x8003BACC; // type:func
 
-//--------------------------------------------------------------------
-//--- PA: 0x016FA4   VA: 0x8003BB04   subsegment: c, bodyprog_8003BD2C
-//--------------------------------------------------------------------
+//---------------------------------------------------------------------------
+//--- PA: 0x016FA4   VA: 0x8003BB04   subsegment: c, events/bodyprog_8003BD2C
+//---------------------------------------------------------------------------
 Map_TypeGet                                  = 0x8003BB04; // type:func
 func_8003BD48                                = 0x8003BB20; // type:func
 func_8003BE28                                = 0x8003BC00; // type:func
@@ -2899,9 +2899,9 @@ g_SysStateFuncs                              = 0x800ABEEC;
 D_800A9A68                                   = 0x800ABF28;
 D_800A9A6C                                   = 0x800ABF2C;
 
-//------------------------------------------------------------
-//--- PA: 0x0873D4   VA: 0x800ABF34   subsegment: .data, title
-//------------------------------------------------------------
+//-------------------------------------------------------------------
+//--- PA: 0x0873D4   VA: 0x800ABF34   subsegment: .data, events/title
+//-------------------------------------------------------------------
 g_MainMenuState                              = 0x800ABF34;
 g_MainMenu_SelectedEntry                     = 0x800ABF38;
 g_MainMenu_VisibleEntryFlags                 = 0x800ABF3C;
@@ -3352,9 +3352,9 @@ g_ItemTriggerItemIds                         = 0x800BF418;
 D_800BCDD4                                   = 0x800BF42C;
 g_MapEventData                               = 0x800BF430;
 
-//-----------------------------------------------------------
-//--- PA: 0x09A8D8   VA: 0x800BF438   subsegment: .bss, title
-//-----------------------------------------------------------
+//------------------------------------------------------------------
+//--- PA: 0x09A8D8   VA: 0x800BF438   subsegment: .bss, events/title
+//------------------------------------------------------------------
 D_800BCDE0                                   = 0x800BF438;
 
 //---------------------------------------------------------------------
diff --git a/configs/JAP2/bodyprog.yaml b/configs/JAP2/bodyprog.yaml
@@ -73,7 +73,7 @@ segments:
       - [0x6F8, .rodata, events/map_msg_display]
       - [0x750, rodata, events/bodyprog_data_800A99B4]
       - [0x810, .rodata, events/game_sys_states]
-      - [0x914, .rodata, title]
+      - [0x914, .rodata, events/title]
       - [0x9B8, rodata]
       - [0x9BC, .rodata, gfx/bodyprog_8003BE50]
       - [0x104C, .rodata, gfx/map_effects]
@@ -131,8 +131,8 @@ segments:
       - [0x12600, c, events/events_main]
       - [0x1303C, c, events/npc_main]
       - [0x13E4C, c, events/game_sys_states]
-      - [0x15DA0, c, title]
-      - [0x16FA4, c, bodyprog_8003BD2C]
+      - [0x15DA0, c, events/title]
+      - [0x16FA4, c, events/bodyprog_8003BD2C]
       - [0x170C8, c, gfx/bodyprog_8003BE50]
       - [0x19860, c, gfx/map_effects]
       - [0x1B27C, c, gfx/bodyprog_80040004]
@@ -364,7 +364,7 @@ segments:
       - [0x87314, data]
       - [0x87380, .data, events/events_main]
       - [0x8738C, .data, events/game_sys_states]
-      - [0x873D4, .data, title]
+      - [0x873D4, .data, events/title]
       - [0x87814, .data, gfx/bodyprog_8003BE50]
       - [0x878E0, .data, gfx/map_effects]
       - [0x87928, data]
@@ -401,7 +401,7 @@ segments:
       - [0x9A874, pad]
       - [0x9A878, .bss, events/game_sys_states]
       - [0x9A8D4, pad]
-      - [0x9A8D8, .bss, title]
+      - [0x9A8D8, .bss, events/title]
       - [0x9A8DC, pad]
       - [0x9A8E0, .bss, gfx/map_effects]
       - [0x9A8F0, bss]
diff --git a/configs/USA/bodyprog.yaml b/configs/USA/bodyprog.yaml
@@ -60,38 +60,38 @@ segments:
       # .rodata section
       - [0x0,    .rodata, bodyprog]
       - [0x4,    .rodata, memcard]
-      - [0x13C, rodata] # Garbage padding (should start at 0x13A but causes mismatches)
+      - [0x13C,   rodata] # Garbage padding (should start at 0x13A but causes mismatches)
       - [0x140,  .rodata, screen/screen_fade]
       - [0x184,  .rodata, screen/cutscene_border]
       - [0x1E4,  .rodata, sys/syswork_globals]
       - [0x1FC,  .rodata, sys/map_info]
       - [0x5AC,  .rodata, sys/fs_screens]
       - [0x5BC,  .rodata, sys/settings_reset]
       - [0x618,  .rodata, sys/memcard_2]
-      - [0x694, rodata] # Garbage padding
+      - [0x694,   rodata] # Garbage padding
       - [0x6A0,  .rodata, game_boot/game_load]
       - [0x6D4,  .rodata, events/bgm_update]
-      - [0x6FC, rodata] # Garbage padding
+      - [0x6FC,   rodata] # Garbage padding
       - [0x700,  .rodata, events/map_msg_display]
       - [0x758,  .rodata, events/bodyprog_data_800A99B4]
       - [0x818,  .rodata, events/game_sys_states]
-      - [0x920,  .rodata, title]
-      - [0x9C3, rodata] # Garbage padding
+      - [0x920,  .rodata, events/title]
+      - [0x9C3,   rodata] # Garbage padding
       - [0x9C8,  .rodata, gfx/bodyprog_8003BE50]
       - [0x1054, .rodata, gfx/map_effects]
-      - [0x1084, rodata] # Garbage padding
+      - [0x1084,  rodata] # Garbage padding
       - [0x1094, .rodata, sound/sd_call]
-      - [0x1200, rodata] # Garbage padding
+      - [0x1200,  rodata] # Garbage padding
       - [0x1208, .rodata, text/text_draw]
       - [0x1330, .rodata, items/item_screens_1]
       - [0x1350, .rodata, items/item_screens_2]
       - [0x179C, .rodata, items/item_screens_3]
       - [0x39CC, .rodata, gfx/bodyprog_80055028]
       - [0x39F4, .rodata, bodyprog_combat_8005BF38]
       - [0x3A14, .rodata, bodyprog_8005E0DC]
-      - [0x3EB8, rodata] # Garbage padding
+      - [0x3EB8,  rodata] # Garbage padding
       - [0x3EC0, .rodata, bodyprog_mapscreen_80066EB0]
-      - [0x3EC8, rodata] # Garbage padding
+      - [0x3EC8,  rodata] # Garbage padding
       - [0x3ECC, .rodata, bodyprog_mapscreen_80066D90]
       - [0x3FE4, .rodata, collision]
       - [0x4BF0, .rodata, bodyprog_800706E4]
@@ -102,7 +102,7 @@ segments:
       - [0x6754, .rodata, water]
       - [0x6778, .rodata, demo]
       - [0x6798, .rodata, ranking]
-      - [0x6A6C, rodata] # Garbage padding
+      - [0x6A6C,  rodata] # Garbage padding
       - [0x6A74,       o, libcd/iso9660, .rdata]
       - [0x6C64,       o, libcd/c_011, .rdata]
       - [0x6C84,       o, libgs/matrix, .rdata]
@@ -166,8 +166,8 @@ segments:
       - [0x12828,   c, events/events_main]       # }
       - [0x13264,   c, events/npc_main]          # }
       - [0x14074,   c, events/game_sys_states]   # }
-      - [0x15FC8,   c, title] # Name convention from SH2/4.
-      - [0x171CC,   c, bodyprog_8003BD2C]
+      - [0x15FC8,   c, events/title] # Name convention from SH2/4.
+      - [0x171CC,   c, events/bodyprog_8003BD2C]
       - [0x172F0,   c, gfx/bodyprog_8003BE50]
       - [0x19A88,   c, gfx/map_effects]
       - [0x1B4A4,   c, gfx/bodyprog_80040004]
@@ -392,7 +392,7 @@ segments:
       - [0x84E54, .data, events/bodyprog_data_800A99B4]
       - [0x84EC0, .data, events/events_main]
       - [0x84ECC, .data, events/game_sys_states]
-      - [0x84F14, .data, title]
+      - [0x84F14, .data, events/title]
       - [0x8534C, .data, gfx/bodyprog_8003BE50]
       - [0x85424, .data, gfx/map_effects]
       - [0x85468, .data, sound/sd_data]
@@ -459,7 +459,7 @@ segments:
       - [0x9821C,  pad] # Garbage.
       - [0x98220, .bss, events/game_sys_states]
       - [0x9827C,  pad] # Garbage.
-      - [0x98280, .bss, title]
+      - [0x98280, .bss, events/title]
       - [0x98284,  pad] # Garbage.
       - [0x98288, .bss, gfx/map_effects]
       - [0x98298,  bss]
diff --git a/configs/USA/sym.bodyprog.txt b/configs/USA/sym.bodyprog.txt
@@ -348,9 +348,9 @@ SysState_EventPlaySound_Update               = 0x8003A4B4; // type:func
 SysState_GameOver_Update                     = 0x8003A52C; // type:func
 GameState_MapEvent_Update                    = 0x8003AA4C; // type:func
 
-//--------------------------------------------------------
-//--- PA: 0x015FC8   VA: 0x8003AB28   subsegment: c, title
-//--------------------------------------------------------
+//---------------------------------------------------------------
+//--- PA: 0x015FC8   VA: 0x8003AB28   subsegment: c, events/title
+//---------------------------------------------------------------
 GameState_MainMenu_Update                    = 0x8003AB28; // type:func
 MainMenu_SelectedOptionIdxReset              = 0x8003B550; // type:func
 MainMenu_MainTextDraw                        = 0x8003B568; // type:func
@@ -362,9 +362,9 @@ MainMenu_FogRandomize                        = 0x8003BAC4; // type:func
 MainMenu_FogScatter                          = 0x8003BBF4; // type:func
 MainMenu_FogUpdate                           = 0x8003BC8C; // type:func
 
-//--------------------------------------------------------------------
-//--- PA: 0x0171CC   VA: 0x8003BD2C   subsegment: c, bodyprog_8003BD2C
-//--------------------------------------------------------------------
+//---------------------------------------------------------------------------
+//--- PA: 0x0171CC   VA: 0x8003BD2C   subsegment: c, events/bodyprog_8003BD2C
+//---------------------------------------------------------------------------
 Map_TypeGet                                  = 0x8003BD2C; // type:func
 
 //------------------------------------------------------------------------
@@ -2352,9 +2352,9 @@ g_RadioPitchState                            = 0x800A9A1C;
 //-----------------------------------------------------------------------------
 g_SysStateFuncs                              = 0x800A9A2C; // type:u32 size:0x3C
 
-//------------------------------------------------------------
-//--- PA: 0x084F14   VA: 0x800A9A74   subsegment: .data, title
-//------------------------------------------------------------
+//-------------------------------------------------------------------
+//--- PA: 0x084F14   VA: 0x800A9A74   subsegment: .data, events/title
+//-------------------------------------------------------------------
 g_MainMenuState                              = 0x800A9A74;
 g_MainMenu_SelectedEntry                     = 0x800A9A78;
 g_MainMenu_VisibleEntryFlags                 = 0x800A9A7C;
diff --git a/src/bodyprog/events/bodyprog_8003BD2C.c b/src/bodyprog/events/bodyprog_8003BD2C.c
@@ -1,22 +1,13 @@
 #include "game.h"
 
 #include <psyq/libetc.h>
-#include <psyq/libpad.h>
-#include <psyq/strings.h>
 
 #include "bodyprog/bodyprog.h"
 #include "bodyprog/math/math.h"
-#include "bodyprog/memcard.h"
-#include "bodyprog/screen/screen_data.h"
-#include "bodyprog/screen/screen_draw.h"
-#include "bodyprog/sound_system.h"
-#include "bodyprog/text/text_draw.h"
 #include "main/fsqueue.h"
-#include "main/rng.h"
-#include "screens/stream/stream.h"
 
 // ========================================
-// UNKNOWN - IN-GAME RELATED
+// NPC COLISIONS FLAGS UPDATE?
 // ========================================
 
 s32 Map_TypeGet(void) // 0x8003BD2C
diff --git a/src/bodyprog/events/title.c b/src/bodyprog/events/title.c
diff --git a/src/bodyprog/gfx/bodyprog_8003BE50.c b/src/bodyprog/gfx/bodyprog_8003BE50.c
diff --git a/src/bodyprog/gfx/map_effects.c b/src/bodyprog/gfx/map_effects.c
