falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix GC JPN dol splits / d_a_npc_prayer mostly done (#2488) 

* jmessage cleanup pass

* more JMessage cleanup

* d_msg_class cleanup

* fix a bunch of gc jpn dol splits

* d_a_npc_prayer pretty much equivalent
This commit is contained in:
TakaRikka 2025-06-18 01:05:44 -07:00 committed by GitHub
parent 23cba4d117
commit 0a899a404e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 1867 additions and 1973 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
config/GZ2J01/splits.txt
View File

@ -143,7 +143,7 @@ f_op/f_op_actor.cpp:
.text start:0x80018B64 end:0x800197BC
.rodata start:0x8037AD20 end:0x8037AD28
.data start:0x8039D710 end:0x8039D740
.sbss start:0x8044ADF8 end:0x8044AE0C
.sbss start:0x8044ADF8 end:0x8044AE08
.sdata2 start:0x8044BD08 end:0x8044BD40
f_op/f_op_actor_iter.cpp:
@ -159,7 +159,7 @@ f_op/f_op_actor_mng.cpp:
.rodata start:0x8037AD28 end:0x8037AEF8
.data start:0x8039D750 end:0x8039D9C0
.bss start:0x803EBD40 end:0x803EBF18
.sbss start:0x8044AE0C end:0x8044AE20
.sbss start:0x8044AE08 end:0x8044AE20
.sdata2 start:0x8044BD40 end:0x8044BDA8
f_op/f_op_camera.cpp:
@ -395,7 +395,7 @@ d/d_bomb.cpp:
d/d_lib.cpp:
.text start:0x80032044 end:0x80032918
.data start:0x803A13A0 end:0x803A13D0
.sbss start:0x8044AF18 end:0x8044AF38
.sbss start:0x8044AF18 end:0x8044AF30
d/d_save.cpp:
.text start:0x80032918 end:0x80035C88
@ -415,6 +415,7 @@ d/d_a_obj.cpp:
.text start:0x80037038 end:0x80037A5C
.rodata start:0x8037B740 end:0x8037B758
.bss start:0x8041E728 end:0x8041E788
.sbss start:0x8044AF30 end:0x8044AF38
.sdata2 start:0x8044BED8 end:0x8044BEF0
d/d_a_itembase_static.cpp:
@ -533,7 +534,7 @@ d/d_drawlist.cpp:
.data start:0x803A2900 end:0x803A2FF8
.bss start:0x8041EA10 end:0x8041EA78
.sdata start:0x8044A788 end:0x8044A7A0
.sbss start:0x8044B014 end:0x8044B028
.sbss start:0x8044B014 end:0x8044B020
.sdata2 start:0x8044C148 end:0x8044C220
.sbss2 start:0x80450C88 end:0x80450C90
@ -547,6 +548,7 @@ d/d_kankyo_wether.cpp:
.rodata start:0x8037C810 end:0x8037C968
.data start:0x803A3C20 end:0x803A3D00
.bss start:0x8041EA78 end:0x8041EA90
.sbss start:0x8044B020 end:0x8044B028
.sdata2 start:0x8044C220 end:0x8044C2F0
d/d_kankyo_rain.cpp:
@ -571,7 +573,7 @@ d/d_attention.cpp:
.rodata start:0x8037CC18 end:0x8037CC28
.data start:0x803A3D58 end:0x803A3DD0
.bss start:0x8041EC40 end:0x8041EC60
.sdata start:0x8044A7A0 end:0x8044A7D0
.sdata start:0x8044A7A0 end:0x8044A7C0
.sdata2 start:0x8044C768 end:0x8044C7F8
d/d_att_dist.cpp:
@ -641,7 +643,7 @@ d/d_bg_w.cpp:
.text start:0x80079204 end:0x8007E5E8
.data start:0x803A5BE0 end:0x803A5E28
.bss start:0x8041ECC0 end:0x8041F0B0
.sbss start:0x8044B0C0 end:0x8044B0D0
.sbss start:0x8044B0C0 end:0x8044B0C8
.sdata2 start:0x8044C838 end:0x8044C858
d/d_bg_w_base.cpp:
@ -690,6 +692,7 @@ d/d_ev_camera.cpp:
.rodata start:0x8037CC98 end:0x8037D210
.data start:0x803A6688 end:0x803A6700
.bss start:0x8041F4E8 end:0x8041F578
.sbss start:0x8044B0C8 end:0x8044B0D0
.sdata2 start:0x8044C9F8 end:0x8044CD08
d/d_item_data.cpp:
@ -711,6 +714,7 @@ d/d_tresure.cpp:
.text start:0x8009BC18 end:0x8009C53C
.rodata start:0x8037D580 end:0x8037D5A8
.bss start:0x8041F578 end:0x8041F648
.sdata start:0x8044A7C0 end:0x8044A7C8
.sbss start:0x8044B0D8 end:0x8044B0E0
.sdata2 start:0x8044CD28 end:0x8044CD50
@ -723,12 +727,14 @@ d/d_model.cpp:
d/d_eye_hl.cpp:
.text start:0x8009C9A4 end:0x8009CBC8
.rodata start:0x8037D5A8 end:0x8037D5E0
.sbss start:0x8044B0E8 end:0x8044B100
.sbss start:0x8044B0E8 end:0x8044B0F0
.sdata2 start:0x8044CD50 end:0x8044CD58
d/d_error_msg.cpp:
.text start:0x8009CBC8 end:0x8009D8B4
.rodata start:0x8037D5E0 end:0x803876D8
.sdata start:0x8044A7C8 end:0x8044A7D0
.sbss start:0x8044B0F0 end:0x8044B0F8
.sdata2 start:0x8044CD58 end:0x8044CD98
.sbss2 start:0x80450C98 end:0x80450CA0
@ -739,7 +745,7 @@ d/actor/d_a_alink.cpp:
.data start:0x803A9AF0 end:0x803AD770
.bss start:0x8041F648 end:0x8041F848
.sdata start:0x8044A7D0 end:0x8044A7E8
.sbss start:0x8044B100 end:0x8044B118
.sbss start:0x8044B0F8 end:0x8044B118
.sdata2 start:0x8044CD98 end:0x8044D4F0
d/actor/d_a_itembase.cpp:
@ -904,7 +910,7 @@ d/d_kankyo.cpp:
.data start:0x803B5F18 end:0x803B62B8
.bss start:0x80426B88 end:0x80428930
.sdata start:0x8044A840 end:0x8044A860
.sbss start:0x8044B1A8 end:0x8044B1B8
.sbss start:0x8044B1A8 end:0x8044B1B0
.sdata2 start:0x8044DCF8 end:0x8044DF90
d/d_kyeff.cpp:
@ -922,6 +928,7 @@ d/d_ky_thunder.cpp:
.rodata start:0x8038EFC0 end:0x8038EFD0
.data start:0x803B6338 end:0x803B6378
.bss start:0x80428930 end:0x80428960
.sbss start:0x8044B1B0 end:0x8044B1B8
.sdata2 start:0x8044DFA8 end:0x8044E030
d/d_kantera_icon_meter.cpp:
@ -1570,7 +1577,7 @@ JSystem/JParticle/JPAResource.cpp:
JSystem/JParticle/JPABaseShape.cpp:
.text start:0x80278EC0 end:0x8027CD48
.data start:0x803BE420 end:0x803BE5C8
.sdata start:0x8044A8E0 end:0x8044A8EC
.sdata start:0x8044A8E0 end:0x8044A8E8
.sdata2 start:0x8044F3C8 end:0x8044F400
JSystem/JParticle/JPAExtraShape.cpp:
@ -1633,10 +1640,12 @@ JSystem/JStage/JSGAmbientLight.cpp:
JSystem/JStage/JSGCamera.cpp:
.text start:0x80282FD0 end:0x802830B0
.text start:0x802830B0 end:0x80283158
.data start:0x803BE7C0 end:0x803BE858
.data start:0x803BE858 end:0x803BE8B8
.sdata2 start:0x8044F4F8 end:0x8044F500
JSystem/JStage/JSGFog.cpp:
.text start:0x802830B0 end:0x80283158
.data start:0x803BE858 end:0x803BE8B8
.sdata2 start:0x8044F500 end:0x8044F508
JSystem/JStage/JSGLight.cpp:
@ -1697,7 +1706,7 @@ JSystem/JStudio/JStudio/jstudio-object.cpp:
.rodata start:0x80394BD0 end:0x80394CF0
.data start:0x803BEC40 end:0x803BF7E0
.bss start:0x8042B150 end:0x8042B2C8
.sbss start:0x8044B330 end:0x8044B348
.sbss start:0x8044B330 end:0x8044B338
.sdata2 start:0x8044F5C0 end:0x8044F5F0
JSystem/JStudio/JStudio/object-id.cpp:
@ -1761,6 +1770,7 @@ JSystem/JStudio/JStudio_JAudio2/object-sound.cpp:
.ctors start:0x80375D98 end:0x80375D9C
.data start:0x803BFBB8 end:0x803BFC18
.bss start:0x8042B5D0 end:0x8042B680
.sbss start:0x8044B338 end:0x8044B340
.sdata2 start:0x8044F630 end:0x8044F640
JSystem/JStudio/JStudio_JParticle/control.cpp:
@ -1772,6 +1782,7 @@ JSystem/JStudio/JStudio_JParticle/object-particle.cpp:
.text start:0x80290A3C end:0x80291718
.data start:0x803BFC30 end:0x803BFC98
.bss start:0x8042B680 end:0x8042B710
.sbss start:0x8044B340 end:0x8044B348
.sdata2 start:0x8044F640 end:0x8044F678
JSystem/JAudio2/JASCalc.cpp:
@ -1931,7 +1942,7 @@ JSystem/JAudio2/JASAiCtrl.cpp:
.rodata start:0x80395448 end:0x803954A0
.data start:0x803C19F8 end:0x803C1A20
.bss start:0x8042BD98 end:0x8042BDA8
.sdata start:0x8044A8EC end:0x8044A8F8
.sdata start:0x8044A8E8 end:0x8044A8F8
.sbss start:0x8044B3E0 end:0x8044B418
.sdata2 start:0x8044F840 end:0x8044F860
@ -2255,7 +2266,7 @@ Z2AudioLib/Z2AudioMgr.cpp:
dolphin/gf/GFGeometry.cpp:
.text start:0x802D0264 end:0x802D02F0
.sdata start:0x8044A9E8 end:0x8044A9F8
.sdata start:0x8044A9E8 end:0x8044A9F0
dolphin/gf/GFLight.cpp:
.text start:0x802D02F0 end:0x802D0338
@ -2271,6 +2282,7 @@ JSystem/JKernel/JKRHeap.cpp:
.text start:0x802D05D4 end:0x802D1250
.rodata start:0x80396C38 end:0x80396C50
.data start:0x803C60B0 end:0x803C6110
.sdata start:0x8044A9F0 end:0x8044A9F1
.sbss start:0x8044B4B0 end:0x8044B4D8
JSystem/JKernel/JKRExpHeap.cpp:
@ -2340,7 +2352,7 @@ JSystem/JKernel/JKRFileLoader.cpp:
.rodata start:0x803972B0 end:0x803972B8
.data start:0x803C6308 end:0x803C6348
.bss start:0x8042E488 end:0x8042E4A0
.sdata start:0x8044AA00 end:0x8044AA0C
.sdata start:0x8044AA00 end:0x8044AA08
.sbss start:0x8044B558 end:0x8044B560
JSystem/JKernel/JKRFileFinder.cpp:
@ -2395,20 +2407,20 @@ JSystem/JKernel/JKRDvdRipper.cpp:
.ctors start:0x80375DE4 end:0x80375DE8
.rodata start:0x803973F0 end:0x80397450
.bss start:0x8042E4B8 end:0x8042E4E8
.sdata start:0x8044AA0C end:0x8044AA14
.sdata start:0x8044AA08 end:0x8044AA10
.sbss start:0x8044B568 end:0x8044B5A8
JSystem/JKernel/JKRDvdAramRipper.cpp:
.text start:0x802DCD10 end:0x802DDB1C
.ctors start:0x80375DE8 end:0x80375DEC
.bss start:0x8042E4E8 end:0x8042E518
.sdata start:0x8044AA14 end:0x8044AA18
.sdata start:0x8044AA10 end:0x8044AA18
.sbss start:0x8044B5A8 end:0x8044B5F0
JSystem/JKernel/JKRDecomp.cpp:
.text start:0x802DDB1C end:0x802DE298
.data start:0x803C65A0 end:0x803C65F0
.sbss start:0x8044B5F0 end:0x8044B5FC
.sbss start:0x8044B5F0 end:0x8044B5F8
JSystem/JSupport/JSUList.cpp:
.text start:0x802DE298 end:0x802DE6D8
@ -2457,7 +2469,7 @@ JSystem/JUtility/JUTNameTab.cpp:
JSystem/JUtility/JUTGraphFifo.cpp:
.text start:0x802E0FF4 end:0x802E1194
.data start:0x803C66D0 end:0x803C66E0
.sbss start:0x8044B5FC end:0x8044B608
.sbss start:0x8044B5F8 end:0x8044B608
JSystem/JUtility/JUTFont.cpp:
.text start:0x802E1194 end:0x802E13E4
@ -3238,15 +3250,16 @@ PowerPC_EABI_Support/Runtime/Src/GCN_Mem_Alloc.c:
PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c:
.text start:0x80364E68 end:0x80364FF4
.bss start:0x80447580 end:0x80447680
.sbss start:0x8044BAD0 end:0x8044BAE8
PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c:
.sbss start:0x8044BAE8 end:0x8044BAF0
.sbss start:0x8044BAD0 end:0x8044BAE0
PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c:
.text start:0x80364FF4 end:0x803654A8
.rodata start:0x8039C380 end:0x8039C398
.bss start:0x80447680 end:0x804476B8
.sbss start:0x8044BAE0 end:0x8044BAE8
PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c:
.sbss start:0x8044BAE8 end:0x8044BAF0
PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c:
.text start:0x803654A8 end:0x803655C0
@ -3305,7 +3318,7 @@ PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c:
.sdata2 start:0x80450790 end:0x80450798
PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c:
.sdata start:0x8044AC20 end:0x8044AC34
.sdata start:0x8044AC20 end:0x8044AC30
PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c:
.text start:0x8036AC28 end:0x8036ACB8
@ -3581,6 +3594,7 @@ amcstubs/AmcExi2Stubs.c:
odemuexi2/DebuggerDriver.c:
.text start:0x803751BC end:0x80375C3C
.sdata start:0x8044AC30 end:0x8044AC34
.sbss start:0x8044BB10 end:0x8044BB28
odenotstub/odenotstub.c:

204
config/GZ2J01/symbols.txt
View File

@ -9,12 +9,12 @@ __flush_cache = .init:0x80003424; // type:function size:0x34 scope:global
memset = .init:0x80003458; // type:function size:0x30 scope:global
__fill_mem = .init:0x80003488; // type:function size:0xB8 scope:global
memcpy = .init:0x80003540; // type:function size:0x50 scope:global
fn_80003590 = .init:0x80003590; // type:function size:0x30
fn_800035C0 = .init:0x800035C0; // type:function size:0x24
TRK_memset = .init:0x80003590; // type:function size:0x30
TRK_memcpy = .init:0x800035C0; // type:function size:0x24
gTRKInterruptVectorTable = .init:0x800035E4; // type:label scope:global
lbl_80004600 = .init:0x80004600; // type:label
lbl_80005400 = .init:0x80005400; // type:label
fn_80005518 = .init:0x80005518; // type:function size:0x2C
__TRK_reset = .init:0x80005518; // type:function size:0x2C
gTRKInterruptVectorTableEnd = .init:0x80005518; // type:label scope:global
_rom_copy_info = .init:0x80005544; // type:object size:0x84 scope:global data:4byte
_bss_init_info = .init:0x800055C8; // type:object size:0x20 scope:global data:4byte
@ -11764,26 +11764,26 @@ __sinit_JASDriverIF_cpp = .text:0x802A0750; // type:function size:0x80 scope:loc
__ct__Q214JASCallbackMgr9TCallbackFv = .text:0x802A07D0; // type:function size:0x10 scope:global align:4
clamp__14JASSoundParamsFv = .text:0x802A07E0; // type:function size:0xCC scope:global align:4
combine__14JASSoundParamsFRC14JASSoundParamsRC14JASSoundParams = .text:0x802A08AC; // type:function size:0x5C scope:global align:4
DSPReleaseHalt2__FUl = .text:0x802A0920; // type:function size:0x48 scope:global align:4
setup_callback__FUs = .text:0x802A0980; // type:function size:0xC scope:global align:4
DsetupTable__FUlUlUlUlUl = .text:0x802A09A0; // type:function size:0x64 scope:global align:4
DsetMixerLevel__Ff = .text:0x802A0A20; // type:function size:0x24 scope:global align:4
DsyncFrame2ch__FUlUlUl = .text:0x802A0A60; // type:function size:0x54 scope:global align:4
DsyncFrame4ch__FUlUlUlUlUl = .text:0x802A0AC0; // type:function size:0x50 scope:global align:4
DspHandShake__FPv = .text:0x802A0B20; // type:function size:0x38 scope:global align:4
DspBoot__FPFPv_v = .text:0x802A0B60; // type:function size:0xAC scope:global align:4
DSPSendCommands2__FPUlUlPFUs_v = .text:0x802A0C20; // type:function size:0xE8 scope:global align:4
DspInitWork__Fv = .text:0x802A0D20; // type:function size:0x2C scope:global align:4
DspStartWork__FUlPFUs_v = .text:0x802A0D60; // type:function size:0x48 scope:global align:4
DspFinishWork__FUs = .text:0x802A0DC0; // type:function size:0x68 scope:global align:4
DSPAddTask = .text:0x802A0E40; // type:function size:0x84 scope:global align:4
DSPAddPriorTask__FP15STRUCT_DSP_TASK = .text:0x802A0EE0; // type:function size:0x7C scope:global align:4
__DSPHandler = .text:0x802A0F60; // type:function size:0x304 scope:global align:4
DsyncFrame2__FUlUlUl = .text:0x802A1280; // type:function size:0x50 scope:global align:4
DsyncFrame3__FUlUlUlUlUl = .text:0x802A12E0; // type:function size:0x58 scope:global align:4
Dsp_Update_Request__Fv = .text:0x802A1340; // type:function size:0x78 scope:global align:4
Dsp_Running_Check__Fv = .text:0x802A13C0; // type:function size:0x14 scope:global align:4
Dsp_Running_Start__Fv = .text:0x802A13E0; // type:function size:0xC scope:global align:4
DSPReleaseHalt2__FUl = .text:0x802A0920; // type:function size:0x48 scope:global align:32
setup_callback__FUs = .text:0x802A0980; // type:function size:0xC scope:global align:32
DsetupTable__FUlUlUlUlUl = .text:0x802A09A0; // type:function size:0x64 scope:global align:32
DsetMixerLevel__Ff = .text:0x802A0A20; // type:function size:0x24 scope:global align:32
DsyncFrame2ch__FUlUlUl = .text:0x802A0A60; // type:function size:0x54 scope:global align:32
DsyncFrame4ch__FUlUlUlUlUl = .text:0x802A0AC0; // type:function size:0x50 scope:global align:32
DspHandShake__FPv = .text:0x802A0B20; // type:function size:0x38 scope:global align:32
DspBoot__FPFPv_v = .text:0x802A0B60; // type:function size:0xAC scope:global align:32
DSPSendCommands2__FPUlUlPFUs_v = .text:0x802A0C20; // type:function size:0xE8 scope:global align:32
DspInitWork__Fv = .text:0x802A0D20; // type:function size:0x2C scope:global align:32
DspStartWork__FUlPFUs_v = .text:0x802A0D60; // type:function size:0x48 scope:global align:32
DspFinishWork__FUs = .text:0x802A0DC0; // type:function size:0x68 scope:global align:32
DSPAddTask = .text:0x802A0E40; // type:function size:0x84 scope:global align:32
DSPAddPriorTask__FP15STRUCT_DSP_TASK = .text:0x802A0EE0; // type:function size:0x7C scope:global align:32
__DSPHandler = .text:0x802A0F60; // type:function size:0x304 scope:global align:32
DsyncFrame2__FUlUlUl = .text:0x802A1280; // type:function size:0x50 scope:global align:32
DsyncFrame3__FUlUlUlUlUl = .text:0x802A12E0; // type:function size:0x58 scope:global align:32
Dsp_Update_Request__Fv = .text:0x802A1340; // type:function size:0x78 scope:global align:32
Dsp_Running_Check__Fv = .text:0x802A13C0; // type:function size:0x14 scope:global align:32
Dsp_Running_Start__Fv = .text:0x802A13E0; // type:function size:0xC scope:global align:32
__dt__10JAIAudibleFv = .text:0x802A13EC; // type:function size:0x48 scope:global align:4
__dt__11JAIAudienceFv = .text:0x802A1434; // type:function size:0x48 scope:global align:4
__ct__5JAISeFP8JAISeMgrP27JAISoundStrategyMgr<5JAISe>Ul = .text:0x802A147C; // type:function size:0xBC scope:global align:4
@ -16615,9 +16615,9 @@ m_hitSeID__12dCcD_GObjInf = .rodata:0x8037CC28; // type:object size:0x60 scope:g
@stringBase0 = .rodata:0x8037D578; // type:object size:0x7 scope:local align:4 data:string_table
typeToTypeGroup__7dTres_c = .rodata:0x8037D580; // type:object size:0x22 scope:global align:4
@stringBase0 = .rodata:0x8037D5A8; // type:object size:0x2A scope:local align:4 data:string_table
black_tex = .rodata:0x8037D5E0; // type:object size:0x40 scope:global align:4
black_tex = .rodata:0x8037D5E0; // type:object size:0x40 scope:global align:32
msg_data = .rodata:0x8037D620; // type:object size:0x220 scope:global align:4
font_data = .rodata:0x8037D840; // type:object size:0x9E80 scope:global align:4
font_data = .rodata:0x8037D840; // type:object size:0x9E80 scope:global align:4 noreloc
@stringBase0 = .rodata:0x803876C0; // type:object size:0x13 scope:local align:4 data:string_table
...rodata.0 = .rodata:0x803876D8; // type:label scope:local align:4
@3757 = .rodata:0x803876D8; // type:object size:0xC scope:local align:4
@ -16765,7 +16765,7 @@ m_mainBckShield__9daAlink_c = .rodata:0x80389C54; // type:object size:0x50 scope
m_mainBckSword__9daAlink_c = .rodata:0x80389CA4; // type:object size:0x14 scope:global align:4
m_mainBckFishing__9daAlink_c = .rodata:0x80389CB8; // type:object size:0x70 scope:global align:4
m_anmDataTable__9daAlink_c = .rodata:0x80389D28; // type:object size:0x1368 scope:global align:4
m_wlAnmDataTable__9daAlink_c = .rodata:0x8038B090; // type:object size:0x498 scope:global align:4
m_wlAnmDataTable__9daAlink_c = .rodata:0x8038B090; // type:object size:0x498 scope:global align:4 noreloc
m_faceTexDataTable__9daAlink_c = .rodata:0x8038B528; // type:object size:0x28C scope:global align:4
@5908 = .rodata:0x8038B7B4; // type:object size:0xC scope:local align:4 data:4byte
atnNormalType1$6976 = .rodata:0x8038B7C0; // type:object size:0x14 scope:local align:4
@ -17066,7 +17066,7 @@ key_tag$5002 = .rodata:0x8038F7B0; // type:object size:0x18 scope:local align:4
item_tag$5040 = .rodata:0x8038F7C8; // type:object size:0x18 scope:local align:4
@stringBase0 = .rodata:0x8038F7E0; // type:object size:0xEB scope:local align:4 data:string_table
...rodata.0 = .rodata:0x8038F8E0; // type:label scope:local align:4
l_paletteDmap_m = .rodata:0x8038F8E0; // type:object size:0xF0 scope:global align:4
l_paletteDmap_m = .rodata:0x8038F8E0; // type:object size:0xF0 scope:global align:4 noreloc
l_dungeon_offColor$3841 = .rodata:0x8038F9D0; // type:object size:0x24 scope:local align:4
l_dungeon_onColor$3842 = .rodata:0x8038F9F4; // type:object size:0x24 scope:local align:4
l_dungeon_stayColor$3843 = .rodata:0x8038FA18; // type:object size:0x24 scope:local align:4
@ -17414,7 +17414,7 @@ sMixFuncs__9JASDriver = .rodata:0x80395448; // type:object size:0x10 scope:globa
@stringBase0 = .rodata:0x80395458; // type:object size:0x48 scope:local align:4 data:string_table
@stringBase0 = .rodata:0x803954A0; // type:object size:0x13 scope:local align:4 data:string_table
DSPADPCM_FILTER__6JASDsp = .rodata:0x803954C0; // type:object size:0x40 scope:global align:4
DSPRES_FILTER__6JASDsp = .rodata:0x80395500; // type:object size:0x500 scope:global align:4
DSPRES_FILTER__6JASDsp = .rodata:0x80395500; // type:object size:0x500 scope:global align:4 noreloc
connect_table$463 = .rodata:0x80395A00; // type:object size:0x18 scope:local align:4
@81 = .rodata:0x80395A18; // type:object size:0x1A scope:local align:4 data:string
@88 = .rodata:0x80395A34; // type:object size:0x1F scope:local align:4 data:string
@ -17658,7 +17658,7 @@ g_ntscZeldaProg = .data:0x8039D0FC; // type:object size:0x3C scope:global align:
g_mDoMtx_identity = .data:0x8039D138; // type:object size:0x30 scope:global align:4
l_invisibleMat$7041 = .data:0x8039D180; // type:object size:0x85 scope:local align:32
l_matDL = .data:0x8039D220; // type:object size:0x84 scope:global align:4
l_mat1DL = .data:0x8039D2C0; // type:object size:0x8D scope:global align:4
l_mat1DL = .data:0x8039D2C0; // type:object size:0x8D scope:global align:4 noreloc
__vt__7JUTFont = .data:0x8039D350; // type:object size:0x44 scope:global align:4
__vt__26mDoExt_3DlineMatSortPacket = .data:0x8039D394; // type:object size:0x14 scope:global align:4
__vt__19mDoExt_3DlineMat1_c = .data:0x8039D3A8; // type:object size:0x14 scope:global align:4
@ -17855,21 +17855,21 @@ m_typeFourData__8dPaPoF_c = .data:0x803A2830; // type:object size:0x3C scope:glo
m_emitterFourData__8dPaPoF_c = .data:0x803A28A8; // type:object size:0x3C scope:global align:4 data:4byte
...data.0 = .data:0x803A2900; // type:label scope:local align:4
cNullVec__6Z2Calc = .data:0x803A2900; // type:object size:0xC scope:local align:4
l_frontZMat = .data:0x803A2920; // type:object size:0x3C scope:global align:4
l_frontNoZSubMat = .data:0x803A2960; // type:object size:0x2A scope:global align:4
l_frontZMat = .data:0x803A2920; // type:object size:0x3C scope:global align:32
l_frontNoZSubMat = .data:0x803A2960; // type:object size:0x2A scope:global align:32
l_shadowVolPos = .data:0x803A298C; // type:object size:0x60 scope:global align:4
l_shadowVolDL = .data:0x803A2A00; // type:object size:0x3B scope:global align:4
l_shadowProjMat = .data:0x803A2A40; // type:object size:0x5A scope:global align:4
l_shadowVolMat = .data:0x803A2AA0; // type:object size:0x5A scope:global align:4
l_clearMat = .data:0x803A2B00; // type:object size:0x55 scope:global align:4
l_frontMat = .data:0x803A2B60; // type:object size:0x55 scope:global align:4
l_backSubMat = .data:0x803A2BC0; // type:object size:0x3C scope:global align:4
l_shadowVolDL = .data:0x803A2A00; // type:object size:0x3B scope:global align:32
l_shadowProjMat = .data:0x803A2A40; // type:object size:0x5A scope:global align:32
l_shadowVolMat = .data:0x803A2AA0; // type:object size:0x5A scope:global align:32 noreloc
l_clearMat = .data:0x803A2B00; // type:object size:0x55 scope:global align:32
l_frontMat = .data:0x803A2B60; // type:object size:0x55 scope:global align:32
l_backSubMat = .data:0x803A2BC0; // type:object size:0x3C scope:global align:32
l_simpleShadowPos = .data:0x803A2BFC; // type:object size:0xA8 scope:global align:4
l_shadowVolumeDL = .data:0x803A2CC0; // type:object size:0x58 scope:global align:4
l_shadowSealTexDL = .data:0x803A2D20; // type:object size:0x55 scope:global align:4
l_shadowSealTex2DL = .data:0x803A2D80; // type:object size:0x55 scope:global align:4
l_shadowSealDL = .data:0x803A2DE0; // type:object size:0x69 scope:global align:4
l_matDL$5404 = .data:0x803A2E60; // type:object size:0x7B scope:local align:4
l_shadowVolumeDL = .data:0x803A2CC0; // type:object size:0x58 scope:global align:32
l_shadowSealTexDL = .data:0x803A2D20; // type:object size:0x55 scope:global align:32
l_shadowSealTex2DL = .data:0x803A2D80; // type:object size:0x55 scope:global align:32
l_shadowSealDL = .data:0x803A2DE0; // type:object size:0x69 scope:global align:32
l_matDL$5404 = .data:0x803A2E60; // type:object size:0x7B scope:local align:32
l_imageDrawColor$5405 = .data:0x803A2EDC; // type:object size:0x10 scope:local align:4
l_tevColorChan$5438 = .data:0x803A2EEC; // type:object size:0x10 scope:local align:4
mtx_adj$5842 = .data:0x803A2EFC; // type:object size:0x30 scope:local align:4
@ -18562,7 +18562,7 @@ __vt__8daItem_c = .data:0x803B4104; // type:object size:0x44 scope:global align:
__vt__9dInsect_c = .data:0x803B41D8; // type:object size:0xC scope:global align:4
__vt__14daObj_SSBase_c = .data:0x803B41E8; // type:object size:0x14 scope:global align:4
arcName$4622 = .data:0x803B4200; // type:object size:0x20 scope:local align:4
l_sightDL = .data:0x803B4220; // type:object size:0x89 scope:global align:4
l_sightDL = .data:0x803B4220; // type:object size:0x89 scope:global align:4 noreloc
__vt__18daPy_sightPacket_c = .data:0x803B42AC; // type:object size:0x10 scope:global align:4
...data.0 = .data:0x803B42C0; // type:label scope:local align:4
cNullVec__6Z2Calc = .data:0x803B42C0; // type:object size:0xC scope:local align:4
@ -19008,7 +19008,7 @@ __vt__14dMenu_DmapBg_c = .data:0x803B6C98; // type:object size:0x1C scope:global
...data.0 = .data:0x803B6CC0; // type:label scope:local align:4
cNullVec__6Z2Calc = .data:0x803B6CC0; // type:object size:0xC scope:local align:4
@3798 = .data:0x803B6CCC; // type:object size:0x44 scope:local align:4
l_data = .data:0x803B6D20; // type:object size:0xF4 scope:global align:4
l_data = .data:0x803B6D20; // type:object size:0xF4 scope:global align:4 noreloc
@3922 = .data:0x803B6E14; // type:object size:0xC scope:local align:4
@3923 = .data:0x803B6E20; // type:object size:0xC scope:local align:4
@3924 = .data:0x803B6E2C; // type:object size:0xC scope:local align:4
@ -19806,10 +19806,10 @@ __vt__13cBgS_PolyInfo = .data:0x803BE110; // type:object size:0xC scope:global a
__vt__8cM3dGCir = .data:0x803BE120; // type:object size:0xC scope:global align:4
__vt__8cM2dGCir = .data:0x803BE12C; // type:object size:0xC scope:global align:4
__vt__8cM3dGCps = .data:0x803BE138; // type:object size:0xC scope:global align:4
e_mtx = .data:0x803BE160; // type:object size:0x30 scope:global align:4
clear_z_TX = .data:0x803BE1A0; // type:object size:0x40 scope:global align:4
e_mtx = .data:0x803BE160; // type:object size:0x30 scope:global align:32
clear_z_TX = .data:0x803BE1A0; // type:object size:0x40 scope:global align:32
__vt__10JFWDisplay = .data:0x803BE1E0; // type:object size:0x18 scope:global align:4
jpa_pos = .data:0x803BE200; // type:object size:0x144 scope:global align:4
jpa_pos = .data:0x803BE200; // type:object size:0x144 scope:global align:32
jpa_crd = .data:0x803BE360; // type:object size:0x20 scope:global align:4
@2829 = .data:0x803BE380; // type:object size:0x2C scope:local align:4
@2828 = .data:0x803BE3AC; // type:object size:0x2C scope:local align:4
@ -20107,7 +20107,7 @@ table_list$151 = .data:0x803C19E8; // type:object size:0x10 scope:local align:4
history$267 = .data:0x803C19F8; // type:object size:0x28 scope:local align:4 data:4byte
__vt__14JASAudioThread = .data:0x803C1A20; // type:object size:0x10 scope:global align:4
SEND_TABLE__6JASDsp = .data:0x803C1A30; // type:object size:0x18 scope:global align:4
jdsp = .data:0x803C1A60; // type:object size:0x1F00 scope:global align:4
jdsp = .data:0x803C1A60; // type:object size:0x1F00 scope:global align:4 noreloc
__vt__10JAIAudible = .data:0x803C3960; // type:object size:0x14 scope:global align:4
__vt__11JAIAudience = .data:0x803C3978; // type:object size:0x20 scope:global align:4
__vt__5JAISe = .data:0x803C3998; // type:object size:0x58 scope:global align:4
@ -20263,8 +20263,8 @@ sCpuExpName__12JUTException = .data:0x803C67A0; // type:object size:0x44 scope:g
__vt__12JUTException = .data:0x803C67E4; // type:object size:0x10 scope:global align:4
...data.0 = .data:0x803C67F8; // type:label scope:local align:4
sAsciiTable__14JUTDirectPrint = .data:0x803C67F8; // type:object size:0x80 scope:global align:4
sFontData__14JUTDirectPrint = .data:0x803C6878; // type:object size:0x100 scope:global align:4
sFontData2__14JUTDirectPrint = .data:0x803C6978; // type:object size:0x134 scope:global align:4
sFontData__14JUTDirectPrint = .data:0x803C6878; // type:object size:0x100 scope:global align:4 noreloc
sFontData2__14JUTDirectPrint = .data:0x803C6978; // type:object size:0x134 scope:global align:4 noreloc
twiceBit$371 = .data:0x803C6AAC; // type:object size:0x10 scope:local align:4
__vt__8JUTVideo = .data:0x803C6AC0; // type:object size:0xC scope:global align:4
__vt__8JUTFader = .data:0x803C6AD0; // type:object size:0x18 scope:global align:4
@ -20634,12 +20634,12 @@ ResetFunctionInfo = .data:0x803CBCD0; // type:object size:0x10 scope:local align
...data.0 = .data:0x803CBF78; // type:label scope:local align:4
@1 = .data:0x803CBF78; // type:object size:0x46 scope:local align:4 data:string
ResetFunctionInfo = .data:0x803CBFC0; // type:object size:0x10 scope:local align:4
CardData = .data:0x803CBFE0; // type:object size:0x160 scope:global align:4
CardData = .data:0x803CBFE0; // type:object size:0x160 scope:global align:32
SectorSizeTable = .data:0x803CC140; // type:object size:0x20 scope:global align:4
LatencyTable = .data:0x803CC160; // type:object size:0x20 scope:global align:4
...data.0 = .data:0x803CC180; // type:label scope:local align:4
@1 = .data:0x803CC180; // type:object size:0x44 scope:local align:4 data:string
DefaultTexData = .data:0x803CC1E0; // type:object size:0x20 scope:global align:4
DefaultTexData = .data:0x803CC1E0; // type:object size:0x20 scope:global align:32
GXDefaultVATList = .data:0x803CC200; // type:object size:0xD0 scope:global align:4
GXDefaultProjData = .data:0x803CC2D0; // type:object size:0x1C scope:global align:4
GXTexRegionAddrTable = .data:0x803CC2EC; // type:object size:0xC0 scope:global align:4 data:4byte
@ -20725,7 +20725,7 @@ DvdErr_stack = .bss:0x803D9120; // type:object size:0xC00 scope:global align:4
Alarm = .bss:0x803D9D20; // type:object size:0x28 scope:local align:4
MemCardStack = .bss:0x803D9D60; // type:object size:0x1000 scope:global align:4
MemCardThread = .bss:0x803DAD60; // type:object size:0x318 scope:global align:4
MemCardWorkArea0 = .bss:0x803DB080; // type:object size:0xA000 scope:global align:4
MemCardWorkArea0 = .bss:0x803DB080; // type:object size:0xA000 scope:global align:32
g_mDoMemCd_control = .bss:0x803E5080; // type:object size:0x2000 scope:global align:4
sTmpBuf = .bss:0x803E7080; // type:object size:0x4000 scope:global align:4 data:4byte
@3741 = .bss:0x803EB080; // type:object size:0xC scope:local align:4
@ -21187,8 +21187,8 @@ sDmaDacBuffer__9JASDriver = .bss:0x8042BD98; // type:object size:0xC scope:globa
sDspSyncCallback__9JASDriver = .bss:0x8042BDB8; // type:object size:0x100 scope:global align:4
sSubFrameCallback__9JASDriver = .bss:0x8042BEB8; // type:object size:0x100 scope:global align:4
sUpdateDacCallback__9JASDriver = .bss:0x8042BFB8; // type:object size:0x100 scope:global align:4
audio_task = .bss:0x8042C0C0; // type:object size:0x50 scope:global align:4
AUDIO_YIELD_BUFFER = .bss:0x8042C120; // type:object size:0x2000 scope:global align:4
audio_task = .bss:0x8042C0C0; // type:object size:0x50 scope:global align:32
AUDIO_YIELD_BUFFER = .bss:0x8042C120; // type:object size:0x2000 scope:global align:32
taskwork = .bss:0x8042E120; // type:object size:0x80 scope:global align:4
sync_stack = .bss:0x8042E1A0; // type:object size:0x14 scope:global align:4 data:4byte
@744 = .bss:0x8042E1B8; // type:object size:0xC scope:local align:4
@ -21285,7 +21285,7 @@ __OSRebootParams = .bss:0x80445BF0; // type:object size:0x1C scope:global align:
...bss.0 = .bss:0x80445C10; // type:label scope:local align:4
__OSErrorTable = .bss:0x80445C10; // type:object size:0x44 scope:global align:4 data:4byte
...bss.0 = .bss:0x80445C60; // type:label scope:local align:4
Scb = .bss:0x80445C60; // type:object size:0x54 scope:global align:4 data:4byte
Scb = .bss:0x80445C60; // type:object size:0x54 scope:global align:32 data:4byte
...bss.0 = .bss:0x80445CB8; // type:label scope:local align:4
RunQueue = .bss:0x80445CB8; // type:object size:0x100 scope:global align:4 data:4byte
IdleThread = .bss:0x80445DB8; // type:object size:0x318 scope:global align:4
@ -21311,8 +21311,8 @@ AlarmForBreak = .bss:0x80446A00; // type:object size:0x28 scope:global align:4
Prev = .bss:0x80446A28; // type:object size:0xC scope:global align:4
Curr = .bss:0x80446A34; // type:object size:0xC scope:global align:4
...bss.0 = .bss:0x80446A40; // type:label scope:local align:4
BB2 = .bss:0x80446A40; // type:object size:0x20 scope:global align:4
CurrDiskID = .bss:0x80446A60; // type:object size:0x20 scope:global align:4
BB2 = .bss:0x80446A40; // type:object size:0x20 scope:global align:32
CurrDiskID = .bss:0x80446A60; // type:object size:0x20 scope:global align:32
DummyCommandBlock = .bss:0x80446A80; // type:object size:0x30 scope:global align:4
ResetAlarm = .bss:0x80446AB0; // type:object size:0x28 scope:global align:4
...bss.0 = .bss:0x80446AD8; // type:label scope:local align:4
@ -21528,12 +21528,12 @@ sStickHigh = .sdata:0x8044A9D8; // type:object size:0x4 scope:global align:4 dat
sStickCenter = .sdata:0x8044A9DC; // type:object size:0x4 scope:global align:4 data:float
sHowlTobikusa = .sdata:0x8044A9E0; // type:object size:0x8 scope:global align:4
cm2hw$539 = .sdata:0x8044A9E8; // type:object size:0x4 scope:local align:4
lbl_8044A9F0 = .sdata:0x8044A9F0; // type:object size:0x1 data:byte
data_804508B0 = .sdata:0x8044A9F0; // type:object size:0x1 data:byte
sSZSBufferSize__7JKRAram = .sdata:0x8044A9F8; // type:object size:0x4 scope:global align:4 data:4byte
rootPath$2498 = .sdata:0x8044AA00; // type:object size:0x2 scope:local align:4 data:string
lbl_8044AA08 = .sdata:0x8044AA08; // type:object size:0x1 data:byte
errorRetry = .sdata:0x8044AA08; // type:object size:0x1 data:byte
sSZSBufferSize__12JKRDvdRipper = .sdata:0x8044AA0C; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8044AA10 = .sdata:0x8044AA10; // type:object size:0x1 data:byte
errorRetry__16JKRDvdAramRipper = .sdata:0x8044AA10; // type:object size:0x1 data:byte
sSZSBufferSize__16JKRDvdAramRipper = .sdata:0x8044AA14; // type:object size:0x4 scope:global align:4 data:4byte
sStickMode__10JUTGamePad = .sdata:0x8044AA18; // type:object size:0x4 scope:global align:4 data:4byte
sClampMode__10JUTGamePad = .sdata:0x8044AA1C; // type:object size:0x4 scope:global align:4 data:4byte
@ -21623,19 +21623,19 @@ __float_nan = .sdata:0x8044AC20; // type:object size:0x4 scope:global align:4 da
__float_huge = .sdata:0x8044AC24; // type:object size:0x4 scope:global align:4 data:float
__float_max = .sdata:0x8044AC28; // type:object size:0x4 scope:global align:4 data:float
__float_epsilon = .sdata:0x8044AC2C; // type:object size:0x4 scope:global align:4 data:float
lbl_8044AC30 = .sdata:0x8044AC30; // type:object size:0x1 data:byte
lbl_8044AC40 = .sbss:0x8044AC40; // type:object size:0x1 data:byte
SendCount = .sdata:0x8044AC30; // type:object size:0x1 data:byte
fillcheck_check_frame = .sbss:0x8044AC40; // type:object size:0x1 data:byte
sPowerOnTime__7mDoMain = .sbss:0x8044AC48; // type:object size:0x8 scope:global align:4 data:4byte
sHungUpTime__7mDoMain = .sbss:0x8044AC50; // type:object size:0x8 scope:global align:4 data:4byte
lbl_8044AC58 = .sbss:0x8044AC58; // type:object size:0x1 data:byte
lbl_8044AC59 = .sbss:0x8044AC59; // type:object size:0x1 data:byte
lbl_8044AC5A = .sbss:0x8044AC5A; // type:object size:0x1 data:byte
mDisplayHeapSize = .sbss:0x8044AC58; // type:object size:0x1 data:byte
mSelectHeapBar = .sbss:0x8044AC59; // type:object size:0x1 data:byte
mCheckHeap = .sbss:0x8044AC5A; // type:object size:0x1 data:byte
console_position_x$3776 = .sbss:0x8044AC5C; // type:object size:0x4 scope:local align:4 data:float
lbl_8044AC60 = .sbss:0x8044AC60; // type:object size:0x1 data:byte
console_x_init$1077 = .sbss:0x8044AC60; // type:object size:0x1 data:byte
console_position_y$3779 = .sbss:0x8044AC64; // type:object size:0x4 scope:local align:4 data:float
lbl_8044AC68 = .sbss:0x8044AC68; // type:object size:0x1 data:byte
console_y_init$1079 = .sbss:0x8044AC68; // type:object size:0x1 data:byte
console_scroll$3782 = .sbss:0x8044AC6C; // type:object size:0x4 scope:local align:4 data:float
lbl_8044AC70 = .sbss:0x8044AC70; // type:object size:0x1 data:byte
console_scroll_init$1081 = .sbss:0x8044AC70; // type:object size:0x1 data:byte
frame$3939 = .sbss:0x8044AC74; // type:object size:0x4 scope:local align:4 data:4byte
sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> = .sbss:0x8044AC78; // type:object size:0x4 scope:global align:4 data:4byte
sInstance__31JASGlobalInstance<10Z2EnvSeMgr> = .sbss:0x8044AC7C; // type:object size:0x4 scope:global align:4 data:4byte
@ -21685,12 +21685,12 @@ mZbufferTimg__13mDoGph_gInf_c = .sbss:0x8044AD14; // type:object size:0x4 scope:
mZbufferTex__13mDoGph_gInf_c = .sbss:0x8044AD18; // type:object size:0x4 scope:global align:4 data:4byte
mFadeRate__13mDoGph_gInf_c = .sbss:0x8044AD1C; // type:object size:0x4 scope:global align:4 data:float
mFadeSpeed__13mDoGph_gInf_c = .sbss:0x8044AD20; // type:object size:0x4 scope:global align:4 data:float
lbl_8044AD24 = .sbss:0x8044AD24; // type:object size:0x1 data:byte
lbl_8044AD25 = .sbss:0x8044AD25; // type:object size:0x1 data:byte
lbl_8044AD26 = .sbss:0x8044AD26; // type:object size:0x1 data:byte
lbl_8044AD27 = .sbss:0x8044AD27; // type:object size:0x1 data:byte
mBlureFlag__13mDoGph_gInf_c = .sbss:0x8044AD24; // type:object size:0x1 data:byte
mBlureRate__13mDoGph_gInf_c = .sbss:0x8044AD25; // type:object size:0x1 data:byte
mFade__13mDoGph_gInf_c = .sbss:0x8044AD26; // type:object size:0x1 data:byte
data_80450BE7 = .sbss:0x8044AD27; // type:object size:0x1 data:byte
lbl_8044AD28 = .sbss:0x8044AD28; // type:object size:0x8 data:byte
lbl_8044AD30 = .sbss:0x8044AD30; // type:object size:0x1 data:byte
mDebugFill = .sbss:0x8044AD30; // type:object size:0x1 data:byte
solidHeapErrors = .sbss:0x8044AD34; // type:object size:0x4 scope:global align:4 data:4byte
gameHeapErrors = .sbss:0x8044AD38; // type:object size:0x4 scope:global align:4 data:4byte
zeldaHeapErrors = .sbss:0x8044AD3C; // type:object size:0x4 scope:global align:4 data:4byte
@ -21745,8 +21745,8 @@ cDyl_DVD = .sbss:0x8044ADF0; // type:object size:0x4 scope:global align:4 data:4
g_fopAc_type = .sbss:0x8044ADF8; // type:object size:0x4 scope:global align:4 data:4byte
stopStatus__10fopAc_ac_c = .sbss:0x8044ADFC; // type:object size:0x4 scope:global align:4 data:4byte
sInstance__35JASGlobalInstance<14JAUSectionHeap> = .sbss:0x8044AE00; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8044AE08 = .sbss:0x8044AE08; // type:object size:0x1 data:byte
lbl_8044AE09 = .sbss:0x8044AE09; // type:object size:0x1 data:byte
HeapAdjustEntry__6fopAcM = .sbss:0x8044AE08; // type:object size:0x1 scope:global data:byte
HeapAdjustVerbose__6fopAcM = .sbss:0x8044AE09; // type:object size:0x1 scope:global data:byte
l_hio = .sbss:0x8044AE0C; // type:object size:0x1 scope:global align:4
mGroundY__11fopAcM_gc_c = .sbss:0x8044AE10; // type:object size:0x4 scope:global align:4 data:float
mRoofY__11fopAcM_rc_c = .sbss:0x8044AE14; // type:object size:0x4 scope:global align:4 data:float
@ -21774,20 +21774,20 @@ lbl_8044AE8C = .sbss:0x8044AE8C; // type:object size:0x1 data:byte
g_fpcPf_ProfileList_p = .sbss:0x8044AE90; // type:object size:0x4 scope:global align:4 data:4byte
tmp_name$4456 = .sbss:0x8044AE98; // type:object size:0x8 scope:local align:4
mProcID__20dStage_roomControl_c = .sbss:0x8044AEA0; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8044AEA4 = .sbss:0x8044AEA4; // type:object size:0x1 data:byte
lbl_8044AEA5 = .sbss:0x8044AEA5; // type:object size:0x1 data:byte
lbl_8044AEA6 = .sbss:0x8044AEA6; // type:object size:0x1 data:byte
lbl_8044AEA7 = .sbss:0x8044AEA7; // type:object size:0x1 data:byte
lbl_8044AEA8 = .sbss:0x8044AEA8; // type:object size:0x1 data:byte
mStayNo__20dStage_roomControl_c = .sbss:0x8044AEA4; // type:object size:0x1 data:byte
mOldStayNo__20dStage_roomControl_c = .sbss:0x8044AEA5; // type:object size:0x1 data:byte
mNextStayNo__20dStage_roomControl_c = .sbss:0x8044AEA6; // type:object size:0x1 data:byte
m_time_pass__20dStage_roomControl_c = .sbss:0x8044AEA7; // type:object size:0x1 data:byte
mNoChangeRoom__20dStage_roomControl_c = .sbss:0x8044AEA8; // type:object size:0x1 data:byte
mArcBankName__20dStage_roomControl_c = .sbss:0x8044AEAC; // type:object size:0x4 scope:global align:4 data:4byte
mArcBankData__20dStage_roomControl_c = .sbss:0x8044AEB0; // type:object size:0x4 scope:global align:4 data:4byte
m_roomDzs__20dStage_roomControl_c = .sbss:0x8044AEB4; // type:object size:0x8 scope:global align:4 data:byte
m_res__22dMap_HIO_prm_res_dst_s = .sbss:0x8044AEC0; // type:object size:0x4 scope:global align:4 data:4byte
m_count__9daArrow_c = .sbss:0x8044AEC8; // type:object size:0x2 scope:global align:2
mSetTop__7daSus_c = .sbss:0x8044AECA; // type:object size:0x2 scope:global align:2 data:2byte
lbl_8044AECC = .sbss:0x8044AECC; // type:object size:0x1 data:byte
lbl_8044AECD = .sbss:0x8044AECD; // type:object size:0x1 data:byte
lbl_8044AECE = .sbss:0x8044AECE; // type:object size:0x1 data:byte
m_flag__8daYkgr_c = .sbss:0x8044AECC; // type:object size:0x1 data:byte
m_alpha_flag__8daYkgr_c = .sbss:0x8044AECD; // type:object size:0x1 data:byte
m_alpha__8daYkgr_c = .sbss:0x8044AECE; // type:object size:0x1 data:byte
m_aim_rate__8daYkgr_c = .sbss:0x8044AED0; // type:object size:0x4 scope:global align:4
m_path__8daYkgr_c = .sbss:0x8044AED4; // type:object size:0x4 scope:global align:4
m_emitter__8daYkgr_c = .sbss:0x8044AED8; // type:object size:0x4 scope:global align:4 data:4byte
@ -21799,13 +21799,13 @@ m_grass__9daGrass_c = .sbss:0x8044AEF0; // type:object size:0x4 scope:global ali
m_flower__9daGrass_c = .sbss:0x8044AEF4; // type:object size:0x4 scope:global align:4 data:4byte
m_myObj__6daMP_c = .sbss:0x8044AEF8; // type:object size:0x4 scope:global align:4 data:4byte
mTagMagne__12daTagMagne_c = .sbss:0x8044AEFC; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8044AF00 = .sbss:0x8044AF00; // type:object size:0x1 data:byte
lbl_8044AF01 = .sbss:0x8044AF01; // type:object size:0x1 data:byte
mPlayerNo__11daTagMist_c = .sbss:0x8044AF00; // type:object size:0x1 data:byte
mSaveFlag__12daObjCarry_c = .sbss:0x8044AF01; // type:object size:0x1 data:byte
mSttsFlag__12daObjCarry_c = .sbss:0x8044AF04; // type:object size:0x5 scope:global align:4
mRoomNo__12daObjCarry_c = .sbss:0x8044AF0C; // type:object size:0x5 scope:global align:4
m_diffTime__11dLib_time_c = .sbss:0x8044AF18; // type:object size:0x8 scope:global align:4 data:4byte
m_stopTime__11dLib_time_c = .sbss:0x8044AF20; // type:object size:0x8 scope:global align:4 data:4byte
lbl_8044AF28 = .sbss:0x8044AF28; // type:object size:0x8 data:byte
m_diffTime__11dLib_time_c = .sbss:0x8044AF18; // type:object size:0x8 scope:global align:8 data:4byte
m_stopTime__11dLib_time_c = .sbss:0x8044AF20; // type:object size:0x8 scope:global align:8 data:4byte
m_timeStopped__11dLib_time_c = .sbss:0x8044AF28; // type:object size:0x1 data:byte
lbl_8044AF30 = .sbss:0x8044AF30; // type:object size:0x1 data:byte
lbl_8044AF31 = .sbss:0x8044AF31; // type:object size:0x1 data:byte
lbl_8044AF32 = .sbss:0x8044AF32; // type:object size:0x1 data:byte
@ -21833,9 +21833,9 @@ lbl_8044AF88 = .sbss:0x8044AF88; // type:object size:0x1 data:byte
lbl_8044AF89 = .sbss:0x8044AF89; // type:object size:0x1 data:byte
it$4206 = .sbss:0x8044AF8C; // type:object size:0x4 scope:local align:4 data:4byte
lbl_8044AF90 = .sbss:0x8044AF90; // type:object size:0x8 data:byte
lbl_8044AF98 = .sbss:0x8044AF98; // type:object size:0x1 data:byte
mNowStayFloorNo__10dMapInfo_c = .sbss:0x8044AF98; // type:object size:0x1 data:byte
mNowStayRoomNo__10dMapInfo_c = .sbss:0x8044AF9C; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8044AFA0 = .sbss:0x8044AFA0; // type:object size:0x1 data:byte
mNowStayFloorNoDecisionFlg__10dMapInfo_c = .sbss:0x8044AFA0; // type:object size:0x1 data:byte
mLayerList__8dMpath_c = .sbss:0x8044AFA4; // type:object size:0x4 scope:global align:4 data:4byte
mMinX__8dMpath_c = .sbss:0x8044AFA8; // type:object size:0x4 scope:global align:4 data:float
mMaxX__8dMpath_c = .sbss:0x8044AFAC; // type:object size:0x4 scope:global align:4 data:float
@ -21861,9 +21861,9 @@ m_b_Light8EcallBack__13dPa_control_c = .sbss:0x8044AFF4; // type:object size:0x4
m_b_Light8PcallBack__13dPa_control_c = .sbss:0x8044AFF8; // type:object size:0x4 scope:global align:4 data:4byte
m_d_Light8EcallBack__13dPa_control_c = .sbss:0x8044AFFC; // type:object size:0x4 scope:global align:4 data:4byte
m_d_Light8PcallBack__13dPa_control_c = .sbss:0x8044B000; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8044B004 = .sbss:0x8044B004; // type:object size:0x1 data:byte
mStatus__13dPa_control_c = .sbss:0x8044B004; // type:object size:0x1 data:byte
mParticleTracePCB__13dPa_control_c = .sbss:0x8044B008; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8044B010 = .sbss:0x8044B010; // type:object size:0x1 data:byte
mWipe__12dDlst_list_c = .sbss:0x8044B010; // type:object size:0x1 data:byte
mWipeRate__12dDlst_list_c = .sbss:0x8044B014; // type:object size:0x4 scope:global align:4 data:float
mWipeSpeed__12dDlst_list_c = .sbss:0x8044B018; // type:object size:0x4 scope:global align:4 data:float
lbl_8044B020 = .sbss:0x8044B020; // type:object size:0x1 data:byte
@ -22006,8 +22006,8 @@ dylPreLoadTime1 = .sbss:0x8044B248; // type:object size:0x8 scope:global align:4
resPreLoadTime0 = .sbss:0x8044B250; // type:object size:0x8 scope:global align:4 data:4byte
resPreLoadTime1 = .sbss:0x8044B258; // type:object size:0x8 scope:global align:4 data:4byte
g_preLoadHIO = .sbss:0x8044B260; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8044B264 = .sbss:0x8044B264; // type:object size:0x1 data:byte
lbl_8044B265 = .sbss:0x8044B265; // type:object size:0x1 data:byte
pauseTimer__9dScnPly_c = .sbss:0x8044B264; // type:object size:0x1 data:byte
nextPauseTimer__9dScnPly_c = .sbss:0x8044B265; // type:object size:0x1 data:byte
g_regHIO = .sbss:0x8044B268; // type:object size:0x4 scope:global align:4 data:4byte
m_nowID__9dkWmark_c = .sbss:0x8044B270; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8044B274 = .sbss:0x8044B274; // type:object size:0x1 data:byte
@ -22253,8 +22253,8 @@ j3dDefaultViewNo = .sbss:0x8044B6D8; // type:object size:0x4 scope:global align:
sInterruptFlag__17J3DDisplayListObj = .sbss:0x8044B6E0; // type:object size:0x4 scope:global align:4 data:4byte
sCurrentPipeline__11J3DShapeMtx = .sbss:0x8044B6E8; // type:object size:0x4 scope:global align:4 data:4byte
sCurrentScaleFlag__11J3DShapeMtx = .sbss:0x8044B6EC; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8044B6F0 = .sbss:0x8044B6F0; // type:object size:0x1 data:byte
lbl_8044B6F1 = .sbss:0x8044B6F1; // type:object size:0x1 data:byte
sNBTFlag__11J3DShapeMtx = .sbss:0x8044B6F0; // type:object size:0x1 data:byte
sLODFlag__11J3DShapeMtx = .sbss:0x8044B6F1; // type:object size:0x1 data:byte
sTexMtxLoadType__11J3DShapeMtx = .sbss:0x8044B6F4; // type:object size:0x4 scope:global align:4 data:4byte
sMtxPtrTbl__21J3DShapeMtxConcatView = .sbss:0x8044B6F8; // type:object size:0x8 scope:global align:4 data:4byte
sTexGenBlock__17J3DDifferedTexMtx = .sbss:0x8044B700; // type:object size:0x4 scope:global align:4 data:4byte
@ -22630,7 +22630,7 @@ borderColor1$3976 = .sdata2:0x8044BE1C; // type:object size:0x4 scope:local alig
@6980 = .sdata2:0x8044BE58; // type:object size:0x4 scope:local align:4 data:float
@6981 = .sdata2:0x8044BE5C; // type:object size:0x4 scope:local align:4 data:float
@7580 = .sdata2:0x8044BE60; // type:object size:0x8 scope:local align:4 data:double
M_dir_base__Q212daObjMovebox5Act_c = .sdata2:0x8044BE68; // type:object size:0x8 scope:global align:4
M_dir_base__Q212daObjMovebox5Act_c = .sdata2:0x8044BE68; // type:object size:0x8 scope:global align:4 noreloc
OPEN_SIZE__7daDsh_c = .sdata2:0x8044BE70; // type:object size:0x4 scope:global align:4
OPEN_ACCEL__7daDsh_c = .sdata2:0x8044BE74; // type:object size:0x4 scope:global align:4
OPEN_SPEED__7daDsh_c = .sdata2:0x8044BE78; // type:object size:0x4 scope:global align:4
@ -26333,9 +26333,9 @@ j2dDefaultTevKColor = .sdata2:0x804502B4; // type:object size:0x4 scope:global a
j2dDefaultTevSwapMode = .sdata2:0x804502B8; // type:object size:0x4 scope:global align:4 data:byte
j2dDefaultTevSwapModeTable = .sdata2:0x804502BC; // type:object size:0x4 scope:global align:4 data:byte
j2dDefaultBlendInfo = .sdata2:0x804502C0; // type:object size:0x4 scope:global align:4 data:byte
lbl_804502C4 = .sdata2:0x804502C4; // type:object size:0x1 data:byte
j2dDefaultPEBlockDither = .sdata2:0x804502C4; // type:object size:0x1 data:byte
j2dDefaultColorChanInfo = .sdata2:0x804502C8; // type:object size:0x4 scope:global align:4
lbl_804502CC = .sdata2:0x804502CC; // type:object size:0x1 data:byte
data_804561AC = .sdata2:0x804502CC; // type:object size:0x1 data:byte
j2dDefaultAlphaCmp = .sdata2:0x804502CE; // type:object size:0x2 scope:global align:2 data:2byte
@1943 = .sdata2:0x804502D0; // type:object size:0x4 scope:local align:4 data:float
@1944 = .sdata2:0x804502D4; // type:object size:0x4 scope:local align:4 data:float
@ -26429,7 +26429,7 @@ j2dDefaultAlphaCmp = .sdata2:0x804502CE; // type:object size:0x2 scope:global al
@1171 = .sdata2:0x804504D8; // type:object size:0x8 scope:local align:4 data:double
j3dDefaultColInfo = .sdata2:0x804504E0; // type:object size:0x4 scope:global align:4 data:4byte
j3dDefaultAmbInfo = .sdata2:0x804504E4; // type:object size:0x4 scope:global align:4 data:4byte
lbl_804504E8 = .sdata2:0x804504E8; // type:object size:0x1 data:byte
data_804563C8 = .sdata2:0x804504E8; // type:object size:0x1 data:byte
j3dDefaultTevOrderInfoNull = .sdata2:0x804504EC; // type:object size:0x4 scope:global align:4 data:4byte
j3dDefaultIndTexOrderNull = .sdata2:0x804504F0; // type:object size:0x4 scope:global align:4 data:4byte
j3dDefaultTevColor = .sdata2:0x804504F4; // type:object size:0x8 scope:global align:4 data:4byte
@ -26439,7 +26439,7 @@ j3dDefaultTevSwapMode = .sdata2:0x80450504; // type:object size:0x4 scope:global
j3dDefaultTevSwapModeTable = .sdata2:0x80450508; // type:object size:0x4 scope:global align:4 data:byte
j3dDefaultBlendInfo = .sdata2:0x8045050C; // type:object size:0x4 scope:global align:4 data:4byte
j3dDefaultColorChanInfo = .sdata2:0x80450510; // type:object size:0x8 scope:global align:4 data:byte
lbl_80450518 = .sdata2:0x80450518; // type:object size:0x1 data:byte
j3dDefaultTevSwapTableID = .sdata2:0x80450518; // type:object size:0x1 data:byte
j3dDefaultAlphaCmpID = .sdata2:0x8045051A; // type:object size:0x2 scope:global align:2 data:2byte
j3dDefaultZModeID = .sdata2:0x8045051C; // type:object size:0x2 scope:global align:2 data:2byte
@781 = .sdata2:0x80450520; // type:object size:0x4 scope:local align:4 data:float

1142
configure.py
View File

File diff suppressed because it is too large Load Diff

162
include/d/actor/d_a_npc.h
View File

@ -911,7 +911,7 @@ public:
/* 8014F6FC */ int MoveBGDelete();
/* 8014F770 */ int MoveBGExecute();
/* 80155FB0 */ virtual ~daBaseNpc_moveBgActor_c();
/* 80155FB0 */ virtual ~daBaseNpc_moveBgActor_c() {}
/* 801503BC */ virtual int CreateHeap() { return 1; }
/* 801503C4 */ virtual int Create() { return 1; }
/* 801503D4 */ virtual int Execute(Mtx**) { return 1; }
@ -943,6 +943,8 @@ public:
/* 801506E0 */ void remove();
/* 801506EC */ fopAc_ac_c* getActorP();
fpc_ProcID getPId() { return mActorID; }
/* 80155E40 */ virtual ~daNpcF_ActorMngr_c() {}
};
@ -1135,20 +1137,20 @@ public:
/* 80154BD8 */ void setHitodamaPrtcl();
/* 80155BF4 */ virtual ~daNpcF_c() {}
/* 80155BC8 */ virtual void setParam();
/* 80155BC0 */ virtual BOOL main();
/* 80155BD8 */ virtual BOOL ctrlBtk();
/* 80155BC8 */ virtual void setParam() {}
/* 80155BC0 */ virtual BOOL main() { return TRUE; }
/* 80155BD8 */ virtual BOOL ctrlBtk() { return FALSE; }
/* 80155BBC */ virtual void adjustShapeAngle() {}
/* 8015276C */ virtual void setMtx();
/* 801527FC */ virtual void setMtx2();
/* 80155BB8 */ virtual void setAttnPos();
/* 80155BB8 */ virtual void setAttnPos() {}
/* 80155BB4 */ virtual void setCollisions() {}
/* 80155BE0 */ virtual bool setExpressionAnm(int i_idx, bool i_modify);
/* 80155EC8 */ virtual bool setExpressionBtp(int i_idx);
/* 80155BF0 */ virtual void setExpression(int i_expression, f32 i_morf);
/* 80155BE8 */ virtual void setMotionAnm(int i_idx, f32 i_morf);
/* 80155BEC */ virtual void setMotion(int i_motion, f32 i_morf, int i_restart);
/* 80155BD0 */ virtual BOOL drawDbgInfo();
/* 80155BE0 */ virtual bool setExpressionAnm(int i_idx, bool i_modify) { return true; }
/* 80155EC8 */ virtual bool setExpressionBtp(int i_idx) { return true; }
/* 80155BF0 */ virtual void setExpression(int i_expression, f32 i_morf) {}
/* 80155BE8 */ virtual void setMotionAnm(int i_idx, f32 i_morf) {}
/* 80155BEC */ virtual void setMotion(int i_motion, f32 i_morf, int i_restart) {}
/* 80155BD0 */ virtual BOOL drawDbgInfo() { return TRUE; }
/* 80155BCC */ virtual void drawOtherMdls() {}
BOOL chkActorInSpeakArea(fopAc_ac_c* i_actorCheck, fopAc_ac_c* i_actorArea) {
@ -1208,7 +1210,7 @@ public:
daNpcF_MatAnm_c() { initialize(); }
/* 80150738 */ void initialize();
/* 8015075C */ void calc(J3DMaterial*) const;
/* 80155ED0 */ ~daNpcF_MatAnm_c();
/* 80155ED0 */ ~daNpcF_MatAnm_c() {}
void setNowOffsetX(float i_nowOffsetX) { mNowOffsetX = i_nowOffsetX; }
void setNowOffsetY(float i_nowOffsetY) { mNowOffsetY = i_nowOffsetY; }
void onEyeMoveFlag() { mEyeMoveFlag = 1; }
@ -1311,59 +1313,95 @@ public:
class daNpcF_MoveBgActor_c : public daNpcF_c {
private:
public:
/* 80155B54 */ ~daNpcF_MoveBgActor_c();
/* 80155E88 */ virtual bool CreateHeap();
/* 80155E90 */ virtual bool Create();
/* 80155EA0 */ virtual bool Execute(f32 (**)[3][4]);
/* 80155EA8 */ virtual bool Draw();
/* 80155E98 */ virtual bool Delete();
/* 80155EB0 */ virtual bool IsDelete();
/* 80155EB8 */ virtual bool ToFore();
/* 80155EC0 */ virtual bool ToBack();
/* 80155B54 */ ~daNpcF_MoveBgActor_c() {}
/* 80155E88 */ virtual bool CreateHeap() { return true; }
/* 80155E90 */ virtual bool Create() { return true; }
/* 80155EA0 */ virtual bool Execute(f32 (**)[3][4]) { return true; }
/* 80155EA8 */ virtual bool Draw() { return true; }
/* 80155E98 */ virtual bool Delete() { return true; }
/* 80155EB0 */ virtual bool IsDelete() { return true; }
/* 80155EB8 */ virtual bool ToFore() { return true; }
/* 80155EC0 */ virtual bool ToBack() { return true; }
};
struct daNpcT_HIOParam {
/* 0x00 */ f32 unk0;
/* 0x04 */ f32 unk4;
/* 0x08 */ f32 unk8;
/* 0x0C */ f32 unkC;
/* 0x10 */ f32 unk10;
/* 0x14 */ f32 unk14;
/* 0x18 */ f32 unk18;
/* 0x1C */ f32 unk1C;
/* 0x20 */ f32 unk20;
/* 0x24 */ f32 unk24;
/* 0x28 */ f32 unk28;
/* 0x2C */ f32 unk2C;
/* 0x30 */ f32 unk30;
/* 0x34 */ f32 unk34;
/* 0x38 */ f32 unk38;
/* 0x3C */ f32 unk3C;
/* 0x40 */ f32 unk40;
/* 0x44 */ f32 unk44;
/* 0x48 */ s16 unk48;
/* 0x4A */ s16 unk4A;
/* 0x4C */ s16 unk4C;
/* 0x4E */ s16 unk4E;
/* 0x50 */ f32 unk50;
/* 0x54 */ f32 unk54;
/* 0x58 */ f32 unk58;
/* 0x5C */ f32 unk5C;
/* 0x60 */ s16 unk60;
/* 0x62 */ s16 unk62;
/* 0x64 */ s16 unk64;
/* 0x66 */ s16 unk66;
/* 0x68 */ s16 unk68;
/* 0x6A */ u8 unk6A;
/* 0x6B */ u8 unk6B;
/* 0x6C */ f32 unk6C;
/* 0x70 */ f32 unk70;
/* 0x74 */ f32 unk74;
/* 0x78 */ f32 unk78;
/* 0x7C */ f32 unk7C;
/* 0x80 */ f32 unk80;
/* 0x84 */ f32 unk84;
/* 0x88 */ f32 unk88;
/* 0x00 */ f32 attention_offset;
/* 0x04 */ f32 gravity;
/* 0x08 */ f32 scale;
/* 0x0C */ f32 real_shadow_size;
/* 0x10 */ f32 weight;
/* 0x14 */ f32 height;
/* 0x18 */ f32 knee_length;
/* 0x1C */ f32 width;
/* 0x20 */ f32 body_angleX_max;
/* 0x24 */ f32 body_angleX_min;
/* 0x28 */ f32 body_angleY_max;
/* 0x2C */ f32 body_angleY_min;
/* 0x30 */ f32 head_angleX_max;
/* 0x34 */ f32 head_angleX_min;
/* 0x38 */ f32 head_angleY_max;
/* 0x3C */ f32 head_angleY_min;
/* 0x40 */ f32 neck_rotation_ratio;
/* 0x44 */ f32 morf_frame;
/* 0x48 */ s16 talk_distance;
/* 0x4A */ s16 talk_angle;
/* 0x4C */ s16 attention_distance;
/* 0x4E */ s16 attention_angle;
/* 0x50 */ f32 fov;
/* 0x54 */ f32 search_distance;
/* 0x58 */ f32 search_height;
/* 0x5C */ f32 search_depth;
/* 0x60 */ s16 attention_time;
/* 0x62 */ s16 damage_time;
/* 0x64 */ s16 face_expression;
/* 0x66 */ s16 motion;
/* 0x68 */ s16 look_mode;
/* 0x6A */ u8 debug_mode_ON;
/* 0x6B */ u8 debug_info_ON;
/* 0x6C */ f32 expression_morf_frame;
/* 0x70 */ f32 box_min_x;
/* 0x74 */ f32 box_min_y;
/* 0x78 */ f32 box_min_z;
/* 0x7C */ f32 box_max_x;
/* 0x80 */ f32 box_max_y;
/* 0x84 */ f32 box_max_z;
/* 0x88 */ f32 box_offset;
};
struct daNpcF_HIOParam {
/* 0x00 */ f32 attention_offset;
/* 0x04 */ f32 gravity;
/* 0x08 */ f32 scale;
/* 0x0C */ f32 real_shadow_size;
/* 0x10 */ f32 weight;
/* 0x14 */ f32 height;
/* 0x18 */ f32 knee_length;
/* 0x1C */ f32 width;
/* 0x20 */ f32 body_angleX_max;
/* 0x24 */ f32 body_angleX_min;
/* 0x28 */ f32 body_angleY_max;
/* 0x2C */ f32 body_angleY_min;
/* 0x30 */ f32 head_angleX_max;
/* 0x34 */ f32 head_angleX_min;
/* 0x38 */ f32 head_angleY_max;
/* 0x3C */ f32 head_angleY_min;
/* 0x40 */ f32 neck_rotation_ratio;
/* 0x44 */ f32 morf_frame;
/* 0x48 */ s16 talk_distance;
/* 0x4A */ s16 talk_angle;
/* 0x4C */ s16 attention_distance;
/* 0x4E */ s16 attention_angle;
/* 0x50 */ f32 fov;
/* 0x54 */ f32 search_distance;
/* 0x58 */ f32 search_height;
/* 0x5C */ f32 search_depth;
/* 0x60 */ s16 attention_time;
/* 0x62 */ s16 damage_time;
/* 0x64 */ s16 face_expression;
/* 0x66 */ s16 motion;
/* 0x68 */ s16 look_mode;
/* 0x6A */ u8 debug_mode_ON;
/* 0x6B */ u8 debug_info_ON;
};
#endif /* D_A_D_A_NPC_H */

88
include/d/actor/d_a_npc_prayer.h
View File

@ -11,54 +11,78 @@
* @details
*
*/
class daNpcPray_c : public fopAc_ac_c {
class daNpcPray_c : public daNpcF_c {
public:
typedef BOOL (daNpcPray_c::*EvtSeq)(int);
/* 80AB2DEC */ daNpcPray_c();
/* 80AB3000 */ ~daNpcPray_c();
/* 80AB3204 */ void Create();
/* 80AB348C */ void CreateHeap();
/* 80AB3610 */ void Delete();
/* 80AB3644 */ void Execute();
/* 80AB3668 */ void Draw();
/* 80AB36A8 */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 80AB3834 */ void createHeapCallBack(fopAc_ac_c*);
/* 80AB3854 */ void ctrlJointCallBack(J3DJoint*, int);
/* 80AB38A0 */ void setParam();
/* 80AB390C */ void main();
/* 80AB3964 */ void setAttnPos();
/* 80AB3B0C */ bool setMotionAnm(int, f32);
/* 80AB3BDC */ void setMotion(int, f32, int);
/* 80AB3C24 */ bool drawDbgInfo();
/* 80AB3204 */ int Create();
/* 80AB348C */ int CreateHeap();
/* 80AB3610 */ int Delete();
/* 80AB3644 */ int Execute();
/* 80AB3668 */ int Draw();
/* 80AB36A8 */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 80AB3834 */ static int createHeapCallBack(fopAc_ac_c*);
/* 80AB3854 */ static int ctrlJointCallBack(J3DJoint*, int);
/* 80AB3C2C */ void reset();
/* 80AB3DBC */ void playMotion();
/* 80AB3F54 */ void setAction(bool (daNpcPray_c::*)(void*));
/* 80AB3F54 */ int setAction(bool (daNpcPray_c::*)(void*));
/* 80AB3FFC */ void setLookMode(int);
/* 80AB4020 */ void lookat();
/* 80AB4200 */ void step(s16, int);
/* 80AB42F4 */ void chkFindPlayer();
/* 80AB43D8 */ void wait(void*);
/* 80AB4674 */ void fear(void*);
/* 80AB4740 */ void talk(void*);
/* 80AB498C */ void demo(void*);
/* 80AB4B20 */ void createHeart();
/* 80AB4BFC */ void _Evt_GetHeart(int);
/* 80AB4CA4 */ void _Evt_GetHeart_CutInit(int const&);
/* 80AB4D34 */ void _Evt_GetHeart_CutMain(int const&);
/* 80AB5798 */ void adjustShapeAngle();
/* 80AB4200 */ bool step(s16, int);
/* 80AB42F4 */ bool chkFindPlayer();
/* 80AB43D8 */ bool wait(void*);
/* 80AB4674 */ bool fear(void*);
/* 80AB4740 */ bool talk(void*);
/* 80AB498C */ bool demo(void*);
/* 80AB4B20 */ fpc_ProcID createHeart();
/* 80AB4BFC */ BOOL _Evt_GetHeart(int);
/* 80AB4CA4 */ BOOL _Evt_GetHeart_CutInit(int const&);
/* 80AB4D34 */ BOOL _Evt_GetHeart_CutMain(int const&);
/* 80AB3000 */ virtual ~daNpcPray_c();
/* 80AB38A0 */ virtual void setParam();
/* 80AB390C */ virtual BOOL main();
/* 80AB5798 */ virtual void adjustShapeAngle() {}
/* 80AB3964 */ virtual void setAttnPos();
/* 80AB3B0C */ virtual void setMotionAnm(int, f32);
/* 80AB3BDC */ virtual void setMotion(int, f32, int);
/* 80AB3C24 */ virtual BOOL drawDbgInfo();
static u8 mEvtSeqList[24];
s16 getMessageNo() { return (fopAcM_GetParam(this) >> 8) & 0xFFFF; }
static EvtSeq mEvtSeqList[];
private:
/* 0x568 */ u8 field_0x568[0xe10 - 0x568];
/* 0xB48 */ Z2CreatureCitizen mSound;
/* 0xBEC */ u8 field_0xBEC[0xBF0 - 0xBEC];
/* 0xBF0 */ daNpcF_Lookat_c mLookat;
/* 0xC8C */ daNpcF_ActorMngr_c mActorMngr[2];
/* 0xC9C */ u8 field_0xC9C[0xCA0 - 0xC9C];
/* 0xCA0 */ dCcD_Cyl mCcCyl;
/* 0xDDC */ bool (daNpcPray_c::*mAction)(void*);
/* 0xDE8 */ request_of_phase_process_class mPhase[2];
/* 0xDF8 */ int field_0xdf8;
/* 0xDFC */ int field_0xdfc;
/* 0xE00 */ int field_0xe00;
/* 0xE04 */ int mMessageNo;
/* 0xE08 */ s16 mLookMode;
/* 0xE0A */ s16 field_0xe0a;
/* 0xE0C */ u16 mActionMode;
/* 0xE0E */ u8 field_0xe0e;
};
STATIC_ASSERT(sizeof(daNpcPray_c) == 0xe10);
struct daNpcPray_HIOParam {
daNpcF_HIOParam common;
};
class daNpcPray_Param_c {
public:
/* 80AB579C */ ~daNpcPray_Param_c();
/* 80AB579C */ virtual ~daNpcPray_Param_c() {}
static u8 const m[108];
static const daNpcPray_HIOParam m;
};

4
include/f_op/f_op_actor_mng.h
View File

@ -418,6 +418,10 @@ inline void fopAcM_SetHomePosition(fopAc_ac_c* i_actor, f32 x, f32 y, f32 z) {
i_actor->home.pos.set(x, y, z);
}
inline void fopAcM_SetAngle(fopAc_ac_c* i_actor, s16 x, s16 y, s16 z) {
i_actor->current.angle.set(x, y, z);
}
inline void dComIfGs_onSwitch(int i_no, int i_roomNo);
inline void dComIfGs_offSwitch(int i_no, int i_roomNo);
inline BOOL dComIfGs_isSwitch(int i_no, int i_roomNo);

100
src/d/actor/d_a_npc4.cpp
View File

@ -1977,97 +1977,19 @@ void daNpcF_clearMessageTmpBit() {
daNpcF_offTmpBit(0x37);
}
/* 80155B54-80155BB4 150494 0060+00 1/0 0/0 0/0 .text __dt__20daNpcF_MoveBgActor_cFv */
daNpcF_MoveBgActor_c::~daNpcF_MoveBgActor_c() {}
/* 80155BB8-80155BBC 1504F8 0004+00 2/0 0/0 0/0 .text setAttnPos__8daNpcF_cFv */
void daNpcF_c::setAttnPos() {}
/* 80155BC0-80155BC8 150500 0008+00 2/0 0/0 0/0 .text main__8daNpcF_cFv */
BOOL daNpcF_c::main() {
return true;
// TODO: dummy to generate weak functions, proper fix later
static void dummyVirtual(daNpcF_MoveBgActor_c* dummy) {
dummy->~daNpcF_MoveBgActor_c();
dummy->CreateHeap();
dummy->Create();
dummy->Execute(NULL);
dummy->Draw();
dummy->Delete();
dummy->IsDelete();
dummy->ToFore();
dummy->ToBack();
}
/* 80155BC8-80155BCC 150508 0004+00 2/0 0/0 0/0 .text setParam__8daNpcF_cFv */
void daNpcF_c::setParam() {}
/* 80155BD0-80155BD8 150510 0008+00 2/0 0/0 0/0 .text drawDbgInfo__8daNpcF_cFv */
BOOL daNpcF_c::drawDbgInfo() {
return true;
}
/* 80155BD8-80155BE0 150518 0008+00 2/0 0/0 0/0 .text ctrlBtk__8daNpcF_cFv */
BOOL daNpcF_c::ctrlBtk() {
return false;
}
/* 80155BE0-80155BE8 150520 0008+00 2/0 0/0 0/0 .text setExpressionAnm__8daNpcF_cFib */
bool daNpcF_c::setExpressionAnm(int param_0, bool param_1) {
return true;
}
/* 80155BE8-80155BEC 150528 0004+00 2/0 0/0 0/0 .text setMotionAnm__8daNpcF_cFif */
void daNpcF_c::setMotionAnm(int param_0, f32 param_1) {}
/* 80155BEC-80155BF0 15052C 0004+00 2/0 0/0 0/0 .text setMotion__8daNpcF_cFifi */
void daNpcF_c::setMotion(int param_0, f32 param_1, int param_2) {}
/* 80155BF0-80155BF4 150530 0004+00 2/0 0/0 0/0 .text setExpression__8daNpcF_cFif */
void daNpcF_c::setExpression(int param_0, f32 param_1) {}
/* 80155E88-80155E90 1507C8 0008+00 1/0 0/0 0/0 .text CreateHeap__20daNpcF_MoveBgActor_cFv */
bool daNpcF_MoveBgActor_c::CreateHeap() {
return true;
}
/* 80155E90-80155E98 1507D0 0008+00 1/0 0/0 0/0 .text Create__20daNpcF_MoveBgActor_cFv */
bool daNpcF_MoveBgActor_c::Create() {
return true;
}
/* 80155E98-80155EA0 1507D8 0008+00 1/0 0/0 0/0 .text Delete__20daNpcF_MoveBgActor_cFv */
bool daNpcF_MoveBgActor_c::Delete() {
return true;
}
/* 80155EA0-80155EA8 1507E0 0008+00 1/0 0/0 0/0 .text Execute__20daNpcF_MoveBgActor_cFPPA3_A4_f */
bool daNpcF_MoveBgActor_c::Execute(f32 (**param_0)[3][4]) {
return true;
}
/* 80155EA8-80155EB0 1507E8 0008+00 1/0 0/0 0/0 .text Draw__20daNpcF_MoveBgActor_cFv */
bool daNpcF_MoveBgActor_c::Draw() {
return true;
}
/* 80155EB0-80155EB8 1507F0 0008+00 1/0 0/0 0/0 .text IsDelete__20daNpcF_MoveBgActor_cFv
*/
bool daNpcF_MoveBgActor_c::IsDelete() {
return true;
}
/* 80155EB8-80155EC0 1507F8 0008+00 1/0 0/0 0/0 .text ToFore__20daNpcF_MoveBgActor_cFv */
bool daNpcF_MoveBgActor_c::ToFore() {
return true;
}
/* 80155EC0-80155EC8 150800 0008+00 1/0 0/0 0/0 .text ToBack__20daNpcF_MoveBgActor_cFv */
bool daNpcF_MoveBgActor_c::ToBack() {
return true;
}
/* 80155EC8-80155ED0 150808 0008+00 2/0 0/0 0/0 .text setExpressionBtp__8daNpcF_cFi */
bool daNpcF_c::setExpressionBtp(int param_0) {
return true;
}
/* 80155ED0-80155FB0 150810 00E0+00 1/0 0/0 0/0 .text __dt__15daNpcF_MatAnm_cFv */
daNpcF_MatAnm_c::~daNpcF_MatAnm_c() {}
/* 80155FB0-80156010 1508F0 0060+00 1/0 0/0 0/0 .text __dt__23daBaseNpc_moveBgActor_cFv
*/
daBaseNpc_moveBgActor_c::~daBaseNpc_moveBgActor_c() {}
/* 803926B0-803926E0 01ED10 0030+00 0/0 0/0 0/0 .rodata mCcDObj__11daBaseNpc_c */
dCcD_SrcGObjInf const daBaseNpc_c::mCcDObj = {
{0, {{0, 0, 0}, {0x0, 0x0}, {0x79}}},

1923
src/d/actor/d_a_npc_prayer.cpp
View File

File diff suppressed because it is too large Load Diff

29
src/d/d_bright_check.cpp
View File

@ -60,23 +60,43 @@ void dBrightCheck_c::screenSet() {
'font_a1', 'font_at2', 'font_at3', 'font_at4', 'font_at',
};
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
static u64 const txTV[] = {
'menu_t6s', 'menu_t6', 'menu_t9s', 'menu_t9', 'menut10s',
'menu_t10', 'menu_t7s', 'menu_t7', 'menu_t8s', 'menu_t8',
};
#else
static u64 const txTV[] = {
'menu_t61', 'menu_t2', 'menu_t91', 'menu_t1', 'menut101',
'menu_t01', 'menu_t71', 'menu_t3', 'menu_t81', 'menu_t4',
};
#endif
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
static u64 const txTVhide[] = {
'fmenu_6n', 'fmenu_9n', 'fmenu_10', 'fmenu_7n', 'fmenu_8n',
};
#else
static u64 const txTVhide[] = {
'menu_6n', 'menu_9n', 'menu_10n', 'menu_7n', 'menu_8n',
};
#endif
mBrightCheck.Scr = new J2DScreen();
JUT_ASSERT(0, mBrightCheck.Scr != 0);
mBrightCheck.Scr->setPriority("zelda_option_check.blo", 0x1100000, mArchive);
mBrightCheck.Scr->search('g_abtn_n')->hide();
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search('t_t00');
mBrightCheck.Scr->search('t_t00')->show();
mBrightCheck.Scr->search('f_t00')->hide();
#else
J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search('f_t00');
mBrightCheck.Scr->search('f_t00')->show();
mBrightCheck.Scr->search('t_t00')->hide();
#endif
settings_text->setFont(mDoExt_getRubyFont());
settings_text->setString(0x40, "");
@ -84,8 +104,14 @@ void dBrightCheck_c::screenSet() {
J2DTextBox* btna_text[5];
for (int i = 0; i < 5; i++) {
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
btna_text[i] = (J2DTextBox*)mBrightCheck.Scr->search(tv_btnA[i]);
mBrightCheck.Scr->search(ftv_btnA[i])->hide();
#else
btna_text[i] = (J2DTextBox*)mBrightCheck.Scr->search(ftv_btnA[i]);
mBrightCheck.Scr->search(tv_btnA[i])->hide();
#endif
btna_text[i]->setFont(mDoExt_getMesgFont());
btna_text[i]->setString(0x40, "");
mBrightCheck.mMsgString->getString(0x564, btna_text[i], NULL, NULL, NULL, 0); // "Complete"
@ -98,7 +124,10 @@ void dBrightCheck_c::screenSet() {
for (int i = 0; i < 10; i++) {
J2DTextBox* check_text = (J2DTextBox*)mBrightCheck.Scr->search(txTV[i]);
check_text->setFont(mDoExt_getMesgFont());
#if (VERSION != VERSION_GCN_JPN) && (VERSION != VERSION_WII_JPN)
check_text->setCharSpace(0.0f);
#endif
if (i < 2) {
check_text->setString(0x100, "");

41
src/d/d_error_msg.cpp
View File

@ -30,6 +30,16 @@ struct BMG_INF1 : JUTDataBlockHeader {
/* 0x10 */ u32 entries[6];
};
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
#define LINE_HEIGHT 30.0f
#define LINE_SPACE 30.0f
#define CHAR_SPACE 3.0f
#else
#define LINE_HEIGHT 23.0f
#define LINE_SPACE 23.0f
#define CHAR_SPACE 1.0f
#endif
/* 8009CB88-8009D194 0974C8 060C+00 1/1 0/0 0/0 .text messageSet__FUlb */
static void messageSet(u32 status, bool i_drawBg) {
BMG_INF1* inf1 = (BMG_INF1*)&msg_data[0x20];
@ -58,22 +68,22 @@ static void messageSet(u32 status, bool i_drawBg) {
size.mSizeY = 22.0f;
tpane.setFontSize(size);
tpane.setCharSpace(1.0f);
tpane.setLineSpace(23.0f);
tpane.setCharSpace(CHAR_SPACE);
tpane.setLineSpace(LINE_SPACE);
tpane.setCharColor(tcharcolor);
tpane.setGradColor(tgradcolor);
tpane.setBlackWhite(tblack, twhite);
spane.setFontSize(size);
spane.setCharSpace(1.0f);
spane.setLineSpace(23.0f);
spane.setCharSpace(CHAR_SPACE);
spane.setLineSpace(LINE_SPACE);
spane.setCharColor(scharcolor);
spane.setGradColor(sgradcolor);
spane.setBlackWhite(sblack, swhite);
const int lineMax = 10;
f32 height = 23.0f;
f32 height = LINE_HEIGHT;
f32 maxWidth = 0.0f;
int cnt = 0;
f32 lineWidth[lineMax];
@ -83,19 +93,23 @@ static void messageSet(u32 status, bool i_drawBg) {
for (; *msg_p != '\0'; msg_p++) {
if (*msg_p == '\n') {
height += 23.0f;
height += LINE_HEIGHT;
cnt++;
JUT_ASSERT(191, cnt < lineMax);
continue;
}
int c = (u8)*msg_p;
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
if (pfont->isLeadByte_ShiftJIS(c)) {
#else
if (pfont->isLeadByte_EUC(c)) {
#endif
msg_p++;
c = (c << 8) | (u8)*msg_p;
}
lineWidth[cnt] += 1.0f + size.mSizeX * ((f32)pfont->getWidth(c) / (f32)pfont->getCellWidth());
lineWidth[cnt] += CHAR_SPACE + size.mSizeX * ((f32)pfont->getWidth(c) / (f32)pfont->getCellWidth());
}
for (int i = 0; i < lineMax; i++) {
@ -104,6 +118,18 @@ static void messageSet(u32 status, bool i_drawBg) {
maxWidth = width;
}
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
f32 temp_0 = 0.0f; // fixes load order
f32 y = temp_0 + ((448.0f - height) / 2);
if (i_drawBg) {
ppane.mAlpha = 0x82;
ppane.draw(0.0f, 0.0f, 608.0f, 448.0f, false, false, false);
}
spane.draw(2.0f, y + 10.0f + 2.0f, 608.0f, HBIND_CENTER);
tpane.draw(0.0f, y + 10.0f, 608.0f, HBIND_CENTER);
#else
f32 temp_0 = 0.0f; // fixes load order
f32 x = temp_0 + ((608.0f - maxWidth) / 2);
f32 y = temp_0 + ((448.0f - height) / 2);
@ -115,6 +141,7 @@ static void messageSet(u32 status, bool i_drawBg) {
spane.draw(x + 2.0f, y + 10.0f + 2.0f, 608.0f, HBIND_LEFT);
tpane.draw(x, y + 10.0f, 608.0f, HBIND_LEFT);
#endif
}
/* 8009D194-8009D354 097AD4 01C0+00 1/1 0/0 0/0 .text draw__14dDvdErrorMsg_cFl */

22
src/d/d_file_sel_info.cpp
View File

@ -64,10 +64,19 @@ void dFile_info_c::screenSet() {
mNoDatBase = new CPaneMgrAlpha(mFileInfo.Scr, 'w_nda_i1', 2, NULL);
J2DTextBox* info_text[4];
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('w_s_t_01');
info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('w_p_t_01');
mFileInfo.Scr->search('f_s_t_02')->hide();
mFileInfo.Scr->search('f_p_t_02')->hide();
#else
info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('f_s_t_02');
info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('f_p_t_02');
mFileInfo.Scr->search('w_s_t_01')->hide();
mFileInfo.Scr->search('w_p_t_01')->hide();
#endif
for (int i = 0; i < 2; i++) {
info_text[i]->setFont(mFileInfo.mFont);
@ -76,10 +85,17 @@ void dFile_info_c::screenSet() {
dMeter2Info_getString(0x3D0, info_text[0]->getStringPtr(), NULL); // Save time
dMeter2Info_getString(0x3D1, info_text[1]->getStringPtr(), NULL); // Total play time
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('w_name01');
info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('w_new_1');
mFileInfo.Scr->search('f_name01')->hide();
mFileInfo.Scr->search('f_new_1')->hide();
#else
info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('f_name01');
info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('f_new_1');
mFileInfo.Scr->search('w_name01')->hide();
mFileInfo.Scr->search('w_new_1')->hide();
#endif
info_text[2] = (J2DTextBox*)mFileInfo.Scr->search('w_time01');
info_text[3] = (J2DTextBox*)mFileInfo.Scr->search('w_ptim01');
@ -177,8 +193,14 @@ static procFunc fileWarningProc[] = {&dFile_info_c::modeWait, &dFile_info_c::mod
void dFile_info_c::setSaveDate(dSv_save_c* i_savedata) {
OSCalendarTime time;
OSTicksToCalendarTime(i_savedata->getPlayer().getPlayerStatusB().getDateIpl(), &time);
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
sprintf(mSaveDate, "%d.%02d.%02d %02d:%02d", time.year, time.mon + 1, time.mday,
time.hour, time.min);
#else
sprintf(mSaveDate, "%02d/%02d/%d %02d:%02d", time.mon + 1, time.mday, time.year,
time.hour, time.min);
#endif
}
/* 80192C70-80192D58 18D5B0 00E8+00 1/1 0/0 0/0 .text setPlayTime__12dFile_info_cFP10dSv_save_c */

50
src/d/d_file_select.cpp
View File

@ -2356,10 +2356,22 @@ void dFile_select_c::screenSet() {
static u64 l_nouseTag[15] = {
'w_mcheck', 'w_tabi1', 'w_tabi2', 'w_tabi3', 'w_doko_c', 'w_uwa_c', 'w_cp_chu', 'w_cpsita',
'w_cp_x', 'w_de', 'w_de_chu', 'w_desita', 'w_de_x', 'w_name', 'w_h_name'};
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
static u64 l_tagName21[2] = {'w_tabi_s', 'w_tabi_x'};
#else
static u64 l_tagName21[2] = {'t_for', 't_for1'};
#endif
static u64 l_tagName18[3] = {'w_de_ef0', 'w_de_ef1', 'w_de_ef2'};
static u64 l_tagName19[3] = {'w_cp_ef0', 'w_cp_ef1', 'w_cp_ef2'};
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
static u64 l_tagName20[2] = {'w_er_msg', 'w_er_msR'};
#else
static u64 l_tagName20[2] = {'er_for0', 'er_for1'};
#endif
static u64 l_tagName131[3] = {'N_sel_00', 'N_sel_01', 'N_sel_02'};
fileSel.Scr = new J2DScreen();
@ -2385,10 +2397,19 @@ void dFile_select_c::screenSet() {
fileSel.Scr->search('Wi_btn_n')->hide();
field_0x0238 = new CPaneMgrAlpha(fileSel.Scr, 'w_n_bbtn', 2, NULL);
field_0x023c = new CPaneMgrAlpha(fileSel.Scr, 'w_n_abtn', 2, NULL);
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
field_0x0240 = new CPaneMgrAlpha(fileSel.Scr, 'w_modo', 2, NULL);
field_0x0244 = new CPaneMgrAlpha(fileSel.Scr, 'w_kete', 2, NULL);
fileSel.Scr->search('f_modo')->hide();
fileSel.Scr->search('f_kete')->hide();
#else
field_0x0240 = new CPaneMgrAlpha(fileSel.Scr, 'f_modo', 2, NULL);
field_0x0244 = new CPaneMgrAlpha(fileSel.Scr, 'f_kete', 2, NULL);
fileSel.Scr->search('w_modo')->hide();
fileSel.Scr->search('w_kete')->hide();
#endif
((J2DTextBox*)field_0x0240->getPanePtr())->setFont(fileSel.mpMessageFont[0]);
((J2DTextBox*)field_0x0244->getPanePtr())->setFont(fileSel.mpMessageFont[0]);
((J2DTextBox*)field_0x0240->getPanePtr())->setString(32, "");
@ -2442,10 +2463,17 @@ void dFile_select_c::screenSet() {
for (int i = 0; i < 15; i++) {
fileSel.Scr->search(l_nouseTag[i])->hide();
}
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
fileSel.Scr->search('t_for')->hide();
fileSel.Scr->search('t_for1')->hide();
#else
fileSel.Scr->search('w_tabi_s')->hide();
fileSel.Scr->search('w_tabi_x')->hide();
fileSel.Scr->search('w_mgn1')->hide();
fileSel.Scr->search('w_mgn2')->hide();
#endif
for (int i = 0; i < 2; i++) {
field_0x020c[i] = new CPaneMgrAlpha(fileSel.Scr, l_tagName21[i], 0, NULL);
((J2DTextBox*)field_0x020c[i]->getPanePtr())->setFont(fileSel.mpMessageFont[0]);
@ -2480,17 +2508,35 @@ void dFile_select_c::screenSet() {
field_0x0208 = 0;
field_0x0209 = 0;
field_0x012c = fileSel.Scr->search('w_er_n');
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
fileSel.Scr->search('er_for0')->hide();
fileSel.Scr->search('er_for1')->hide();
#else
fileSel.Scr->search('w_er_msg')->hide();
fileSel.Scr->search('w_er_msR')->hide();
#endif
fileSel.Scr->search('w_er_msE')->hide();
for (int i = 0; i < 2; i++) {
field_0x0138[i] = new CPaneMgrAlpha(fileSel.Scr, l_tagName20[i], 0, NULL);
((J2DTextBox*)field_0x0138[i]->getPanePtr())->setFont(fileSel.mpMessageFont[0]);
((J2DTextBox*)field_0x0138[i]->getPanePtr())->setString(512, "");
#if (VERSION != VERSION_GCN_JPN) && (VERSION != VERSION_WII_JPN)
field_0x0138[i]->getPanePtr()->resize(440.0f, 198.0f);
#endif
((J2DTextBox*)field_0x0138[i]->getPanePtr())->setFontSize(21.0f, 21.0f);
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
((J2DTextBox*)field_0x0138[i]->getPanePtr())->setLineSpace(22.0f);
((J2DTextBox*)field_0x0138[i]->getPanePtr())->setCharSpace(2.0f);
#else
((J2DTextBox*)field_0x0138[i]->getPanePtr())->setLineSpace(21.0f);
((J2DTextBox*)field_0x0138[i]->getPanePtr())->setCharSpace(1.0f);
#endif
field_0x0140[i] = ((J2DTextBox*)field_0x0138[i]->getPanePtr())->getStringPtr();
field_0x0138[i]->show();
}
@ -3302,7 +3348,11 @@ void dFile_select_c::MemCardStatCheck() {
field_0x0280 = false;
field_0x0284 = NULL;
field_0x0273 = 2;
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
field_0x0290 = &dFile_select_c::noFileSpaceDispInit;
#else
field_0x0290 = &dFile_select_c::noSaveSelDispInit;
#endif
field_0x0274 = 18;
break;
case 2:

2
src/d/d_insect.cpp
View File

@ -9,6 +9,7 @@
#include "m_Do/m_Do_lib.h"
#include "dol2asm.h"
#if VERSION == VERSION_GCN_USA
// This is a HACK to get d_insect data at correct address due to
// issues with the d_a_obj_item vtable. TODO: fix daItem_c vtable
#pragma push
@ -24,6 +25,7 @@ SECTION_DATA extern void* __vt__8daItem_c__HACK[] = {
NULL,
};
#pragma pop
#endif
/* 8015E010-8015E078 158950 0068+00 0/0 0/0 13/13 .text __ct__9dInsect_cFv */
dInsect_c::dInsect_c() {

9
src/d/d_menu_fishing.cpp
View File

@ -297,8 +297,15 @@ void dMenu_Fishing_c::screenSetBase() {
}
mpFishInfoParent[0] = new CPaneMgr(mpScreen, 'info_blu', 0, NULL);
mpFishInfoParent[1] = new CPaneMgr(mpScreen, 'info_red', 0, NULL);
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('t_t00');
mpScreen->search('f_t00')->hide();
#else
J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('f_t00');
mpScreen->search('t_t00')->hide();
#endif
textBox->setFont(mDoExt_getSubFont());
textBox->setString(0x200, "");
mpString->getString(0x5a1, textBox, NULL, NULL, NULL, 0);
@ -509,4 +516,4 @@ void dMenu_Fishing_c::setHIO(bool i_useHIO) {
g_drawHIO.mCollectScreen.mButtonBTextScale);
}
}
}
}