diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index 16844fcc..ed79ad30 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -313,7 +313,7 @@ d/d_rumble.cpp: .text start:0x800664F0 end:0x80066F58 align:16 .ctors start:0x804DB6A0 end:0x804DB6A4 .data start:0x8050DFA0 end:0x8050DFAC - .sbss start:0x80575268 end:0x8057526C + .sbss start:0x80575268 end:0x80575270 .sdata2 start:0x80577958 end:0x80577994 .bss start:0x805A0778 end:0x805A0868 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index ff581d09..0b13763a 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -40617,7 +40617,7 @@ lbl_8057406C = .sdata:0x8057406C; // type:object size:0x4 data:4byte lbl_80574070 = .sdata:0x80574070; // type:object size:0x8 lbl_80574078 = .sdata:0x80574078; // type:object size:0x8 lbl_80574080 = .sdata:0x80574080; // type:object size:0x8 -lbl_80574088 = .sdata:0x80574088; // type:object size:0x4 scope:local data:4byte +@14637 = .sdata:0x80574088; // type:object size:0x4 scope:local data:4byte lbl_80574090 = .sdata:0x80574090; // type:object size:0x8 lbl_80574098 = .sdata:0x80574098; // type:object size:0x4 lbl_8057409C = .sdata:0x8057409C; // type:object size:0x4 @@ -43334,20 +43334,19 @@ lbl_80577948 = .sdata2:0x80577948; // type:object size:0x4 align:4 data:float lbl_8057794C = .sdata2:0x8057794C; // type:object size:0x4 align:4 data:float lbl_80577950 = .sdata2:0x80577950; // type:object size:0x4 align:4 data:float lbl_80577954 = .sdata2:0x80577954; // type:object size:0x4 align:4 data:float -lbl_80577958 = .sdata2:0x80577958; // type:object size:0x4 data:4byte -lbl_8057795C = .sdata2:0x8057795C; // type:object size:0x4 data:4byte -lbl_80577960 = .sdata2:0x80577960; // type:object size:0x4 align:4 data:float -lbl_80577964 = .sdata2:0x80577964; // type:object size:0x4 align:4 data:float -lbl_80577968 = .sdata2:0x80577968; // type:object size:0x4 align:4 data:float -lbl_8057796C = .sdata2:0x8057796C; // type:object size:0x4 align:4 data:float -lbl_80577970 = .sdata2:0x80577970; // type:object size:0x8 align:8 data:double -lbl_80577978 = .sdata2:0x80577978; // type:object size:0x4 align:4 data:float -lbl_8057797C = .sdata2:0x8057797C; // type:object size:0x4 align:4 data:float -lbl_80577980 = .sdata2:0x80577980; // type:object size:0x4 align:4 data:float -lbl_80577984 = .sdata2:0x80577984; // type:object size:0x4 align:4 data:float -lbl_80577988 = .sdata2:0x80577988; // type:object size:0x4 align:4 data:float -lbl_8057798C = .sdata2:0x8057798C; // type:object size:0x4 align:4 data:float -lbl_80577990 = .sdata2:0x80577990; // type:object size:0x4 align:4 data:float +@13148 = .sdata2:0x80577958; // type:object size:0x8 scope:local data:4byte +@13500 = .sdata2:0x80577960; // type:object size:0x4 scope:local align:4 data:float +@13501 = .sdata2:0x80577964; // type:object size:0x4 scope:local align:4 data:float +@13502 = .sdata2:0x80577968; // type:object size:0x4 scope:local align:4 data:float +@13503 = .sdata2:0x8057796C; // type:object size:0x4 scope:local align:4 data:float +@13505 = .sdata2:0x80577970; // type:object size:0x8 scope:local align:8 data:double +@13590 = .sdata2:0x80577978; // type:object size:0x4 scope:local align:4 data:float +@13591 = .sdata2:0x8057797C; // type:object size:0x4 scope:local align:4 data:float +@13592 = .sdata2:0x80577980; // type:object size:0x4 scope:local align:4 data:float +@13593 = .sdata2:0x80577984; // type:object size:0x4 scope:local align:4 data:float +@13594 = .sdata2:0x80577988; // type:object size:0x4 scope:local align:4 data:float +@13595 = .sdata2:0x8057798C; // type:object size:0x4 scope:local align:4 data:float +@13596 = .sdata2:0x80577990; // type:object size:0x4 scope:local align:4 data:float lbl_80577998 = .sdata2:0x80577998; // type:object size:0x4 align:4 data:float lbl_8057799C = .sdata2:0x8057799C; // type:object size:0x4 align:4 data:float lbl_805779A0 = .sdata2:0x805779A0; // type:object size:0x4 align:4 data:float @@ -48327,14 +48326,14 @@ lbl_8057D284 = .sdata2:0x8057D284; // type:object size:0x4 align:4 data:float lbl_8057D288 = .sdata2:0x8057D288; // type:object size:0x4 align:4 data:float lbl_8057D28C = .sdata2:0x8057D28C; // type:object size:0x4 align:4 data:float lbl_8057D290 = .sdata2:0x8057D290; // type:object size:0x4 align:4 data:float -lbl_8057D298 = .sdata2:0x8057D298; // type:object size:0x4 scope:local align:4 data:float -lbl_8057D29C = .sdata2:0x8057D29C; // type:object size:0x4 scope:local align:4 data:float -lbl_8057D2A0 = .sdata2:0x8057D2A0; // type:object size:0x4 scope:local align:4 data:float -lbl_8057D2A4 = .sdata2:0x8057D2A4; // type:object size:0x4 scope:local align:4 data:float -lbl_8057D2A8 = .sdata2:0x8057D2A8; // type:object size:0x4 scope:local align:4 data:float -lbl_8057D2AC = .sdata2:0x8057D2AC; // type:object size:0x4 scope:local align:4 data:float -lbl_8057D2B0 = .sdata2:0x8057D2B0; // type:object size:0x4 scope:local align:4 data:float -lbl_8057D2B4 = .sdata2:0x8057D2B4; // type:object size:0x4 scope:local align:4 data:float +@15358 = .sdata2:0x8057D298; // type:object size:0x4 scope:local align:4 data:float +@15812 = .sdata2:0x8057D29C; // type:object size:0x4 scope:local align:4 data:float +@15813 = .sdata2:0x8057D2A0; // type:object size:0x4 scope:local align:4 data:float +@15814 = .sdata2:0x8057D2A4; // type:object size:0x4 scope:local align:4 data:float +@15815 = .sdata2:0x8057D2A8; // type:object size:0x4 scope:local align:4 data:float +@15816 = .sdata2:0x8057D2AC; // type:object size:0x4 scope:local align:4 data:float +@15817 = .sdata2:0x8057D2B0; // type:object size:0x4 scope:local align:4 data:float +@15818 = .sdata2:0x8057D2B4; // type:object size:0x4 scope:local align:4 data:float lbl_8057D2B8 = .sdata2:0x8057D2B8; // type:object size:0x4 align:4 data:float lbl_8057D2C0 = .sdata2:0x8057D2C0; // type:object size:0x4 align:4 data:float lbl_8057D2C4 = .sdata2:0x8057D2C4; // type:object size:0x4 align:4 data:float @@ -50386,6 +50385,7 @@ sHandMats = .bss:0x805A06C8; // type:object size:0xE scope:local data:byte sFader__8dScene_c = .bss:0x805A06FC; // type:object size:0x24 data:4byte SysConfig = .bss:0x805A0720; // type:object size:0x58 data:4byte sRumblePreset0__9dRumble_c = .bss:0x805A0778; // type:object size:0xC data:4byte +...bss.0 = .bss:0x805A0778; // type:label scope:local sRumblePreset1__9dRumble_c = .bss:0x805A0784; // type:object size:0xC data:4byte sRumblePreset2__9dRumble_c = .bss:0x805A0790; // type:object size:0xC data:4byte sRumblePreset3__9dRumble_c = .bss:0x805A079C; // type:object size:0xC data:4byte @@ -50396,8 +50396,8 @@ sRumblePreset7__9dRumble_c = .bss:0x805A07CC; // type:object size:0xC data:4byte sRumblePreset8__9dRumble_c = .bss:0x805A07D8; // type:object size:0xC data:4byte sRumblePreset9__9dRumble_c = .bss:0x805A07E4; // type:object size:0xC data:4byte sRumblePreset10__9dRumble_c = .bss:0x805A07F0; // type:object size:0xC data:4byte -lbl_805A07FC = .bss:0x805A07FC; // type:object size:0x42 scope:local data:byte -lbl_805A0840 = .bss:0x805A0840; // type:object size:0x21 scope:local data:byte +@LOCAL@play__9dRumble_cFv@rumble_strings = .bss:0x805A07FC; // type:object size:0x42 scope:local data:byte +@LOCAL@start__9dRumble_cFRC14dRumbleEntry_cUl@rumble_string = .bss:0x805A0840; // type:object size:0x21 scope:local data:byte @LOCAL@getCurrentStageDirectory__22CurrentStageArcManagerFv@sStageDirTmp = .bss:0x805A0868; // type:object size:0x40 scope:local data:byte s_roomArcTmp = .bss:0x805A08A8; // type:object size:0x20 scope:local data:byte lbl_805A08C8 = .bss:0x805A08C8; // type:object size:0x138 data:2byte